phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-10 03:47:29 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rpc: Do not wait for headers inside loadtxoutset

Browse source
This commit is contained in:
MarcoFalke 2024-01-29 16:22:19 +01:00
parent cad2df24b3
commit faa30a4c56
No known key found for this signature in database
2 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/devtools/test_utxo_snapshots.sh
View file

@ -183,8 +183,8 @@ echo "-- Initial state of the client:"
client_rpc getchainstates client_rpc getchainstates
echo echo
echo "-- Loading UTXO snapshot into client..." echo "-- Loading UTXO snapshot into client. Calling RPC in a loop..."
client_rpc loadtxoutset "$UTXO_DAT_FILE" while ! client_rpc loadtxoutset "$UTXO_DAT_FILE" ; do sleep 10; done
watch -n 0.3 "( tail -n 14 $CLIENT_DATADIR/debug.log ; echo ; ./src/bitcoin-cli -rpcport=$CLIENT_RPC_PORT -datadir=$CLIENT_DATADIR getchainstates) | cat" watch -n 0.3 "( tail -n 14 $CLIENT_DATADIR/debug.log ; echo ; ./src/bitcoin-cli -rpcport=$CLIENT_RPC_PORT -datadir=$CLIENT_DATADIR getchainstates) | cat"

30
src/rpc/blockchain.cpp
View file

@ -2571,7 +2571,7 @@ static RPCHelpMan dumptxoutset()
{ {
return RPCHelpMan{ return RPCHelpMan{
"dumptxoutset", "dumptxoutset",
"Write the serialized UTXO set to disk.", "Write the serialized UTXO set to a file.",
{ {
{"path", RPCArg::Type::STR, RPCArg::Optional::NO, "Path to the output file. If relative, will be prefixed by datadir."}, {"path", RPCArg::Type::STR, RPCArg::Optional::NO, "Path to the output file. If relative, will be prefixed by datadir."},
}, },
@ -2699,7 +2699,7 @@ static RPCHelpMan loadtxoutset()
{ {
return RPCHelpMan{ return RPCHelpMan{
"loadtxoutset", "loadtxoutset",
"Load the serialized UTXO set from disk.\n" "Load the serialized UTXO set from a file.\n"
"Once this snapshot is loaded, its contents will be " "Once this snapshot is loaded, its contents will be "
"deserialized into a second chainstate data structure, which is then used to sync to " "deserialized into a second chainstate data structure, which is then used to sync to "
"the network's tip. " "the network's tip. "
@ -2753,34 +2753,14 @@ static RPCHelpMan loadtxoutset()
throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("Unable to load UTXO snapshot, " throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("Unable to load UTXO snapshot, "
"assumeutxo block hash in snapshot metadata not recognized (%s)", base_blockhash.ToString())); "assumeutxo block hash in snapshot metadata not recognized (%s)", base_blockhash.ToString()));
} }
int max_secs_to_wait_for_headers = 60 * 10; CBlockIndex* snapshot_start_block = WITH_LOCK(::cs_main,
CBlockIndex* snapshot_start_block = nullptr;
LogPrintf("[snapshot] waiting to see blockheader %s in headers chain before snapshot activation\n",
base_blockhash.ToString());
while (max_secs_to_wait_for_headers > 0) {
snapshot_start_block = WITH_LOCK(::cs_main,
return chainman.m_blockman.LookupBlockIndex(base_blockhash)); return chainman.m_blockman.LookupBlockIndex(base_blockhash));
max_secs_to_wait_for_headers -= 1;
if (!IsRPCRunning()) {
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Shutting down");
}
if (!snapshot_start_block) {
std::this_thread::sleep_for(std::chrono::seconds(1));
} else {
break;
}
}
if (!snapshot_start_block) { if (!snapshot_start_block) {
LogPrintf("[snapshot] timed out waiting for snapshot start blockheader %s\n",
base_blockhash.ToString());
throw JSONRPCError( throw JSONRPCError(
RPC_INTERNAL_ERROR, RPC_INTERNAL_ERROR,
"Timed out waiting for base block header to appear in headers chain"); strprintf("The base block header (%s) must appear in the headers chain. Make sure all headers are syncing, and call this RPC again.",
base_blockhash.ToString()));
} }
if (!chainman.ActivateSnapshot(afile, metadata, false)) { if (!chainman.ActivateSnapshot(afile, metadata, false)) {
throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to load UTXO snapshot " + fs::PathToString(path)); throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to load UTXO snapshot " + fs::PathToString(path));