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

Merge bitcoin/bitcoin#28631: devtools: test_utxo_snapshots.sh sleep cleanup and documentation

Browse source 
36a3004a41 devtools: test_utxo_snapshots.sh sleep cleanup and documentation (Fabian Jahr)

Pull request description:

  There were bare sleep statements in the script where it was unclear why they were needed and I think they could also be replaced by existing helpers.

ACKs for top commit:
  Sjors:
    utACK 36a3004a41
  pablomartin4btc:
    utACK 36a3004a41

Tree-SHA512: b6e2fc69cd7babcfa7f413f11304f4d648d6d64b3b526862664ccedb0016ad182b9e886aa4e8c33315e4c18824512e11a4fd6365f9c3c95093967d3ef7687e62
This commit is contained in:
fanquake 2023-10-13 11:16:18 +02:00
commit 73dfa6da08
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
contrib/devtools/test_utxo_snapshots.sh
View file

@ -72,6 +72,9 @@ server_sleep_til_boot() {
client_sleep_til_boot() { client_sleep_til_boot() {
while ! client_rpc ping >/dev/null 2>&1; do sleep 0.1; done while ! client_rpc ping >/dev/null 2>&1; do sleep 0.1; done
} }
server_sleep_til_shutdown() {
while server_rpc ping >/dev/null 2>&1; do sleep 0.1; done
}
mkdir -p "$SERVER_DATADIR" "$CLIENT_DATADIR" mkdir -p "$SERVER_DATADIR" "$CLIENT_DATADIR"
@ -109,7 +112,7 @@ echo "-- IBDing the blocks (height=$BASE_HEIGHT) required to the server node..."
echo echo
echo "-- Creating snapshot at ~ height $BASE_HEIGHT ($UTXO_DAT_FILE)..." echo "-- Creating snapshot at ~ height $BASE_HEIGHT ($UTXO_DAT_FILE)..."
sleep 2 server_sleep_til_shutdown # wait for stopatheight to be hit
./src/bitcoind -logthreadnames=1 $SERVER_PORTS \ ./src/bitcoind -logthreadnames=1 $SERVER_PORTS \
-datadir="$SERVER_DATADIR" $EARLY_IBD_FLAGS -connect=0 -listen=0 >/dev/null & -datadir="$SERVER_DATADIR" $EARLY_IBD_FLAGS -connect=0 -listen=0 >/dev/null &
SERVER_PID="$!" SERVER_PID="$!"
@ -124,8 +127,7 @@ RPC_AU=$(jq -r .txoutset_hash < "$DUMP_OUTPUT")
RPC_NCHAINTX=$(jq -r .nchaintx < "$DUMP_OUTPUT") RPC_NCHAINTX=$(jq -r .nchaintx < "$DUMP_OUTPUT")
RPC_BLOCKHASH=$(jq -r .base_hash < "$DUMP_OUTPUT") RPC_BLOCKHASH=$(jq -r .base_hash < "$DUMP_OUTPUT")
# Wait for server to shutdown... server_sleep_til_shutdown
while server_rpc ping >/dev/null 2>&1; do sleep 0.1; done
echo echo
echo "-- Now: add the following to CMainParams::m_assumeutxo_data" echo "-- Now: add the following to CMainParams::m_assumeutxo_data"
@ -186,9 +188,7 @@ echo " Press CTRL+C after you're satisfied to exit the demo"
echo echo
read -p "Press [enter] to continue" read -p "Press [enter] to continue"
while kill -0 "$CLIENT_PID"; do client_sleep_til_boot
sleep 1
done
./src/bitcoind $CLIENT_PORTS $ALL_INDEXES -logthreadnames=1 -datadir="$CLIENT_DATADIR" -connect=0 \ ./src/bitcoind $CLIENT_PORTS $ALL_INDEXES -logthreadnames=1 -datadir="$CLIENT_DATADIR" -connect=0 \
-addnode=127.0.0.1:$SERVER_PORT "$EARLY_IBD_FLAGS" >/dev/null & -addnode=127.0.0.1:$SERVER_PORT "$EARLY_IBD_FLAGS" >/dev/null &
CLIENT_PID="$!" CLIENT_PID="$!"