gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wait for network recovery after restart (#4000)

Browse Source
This commit is contained in:
Rob Walker
2019-04-26 07:30:52 -07:00
committed by Michael Vines
parent 82776b333d
commit eebdfe8d73
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
multinode-demo/fullnode.sh
View File

@ -155,7 +155,7 @@ while true; do
$solana_ledger_tool --ledger "$ledger_config_dir" verify $solana_ledger_tool --ledger "$ledger_config_dir" verify
fi fi
trap 'kill "$pid" && wait "$pid"' INT TERM ERR trap '[[ -n $pid ]] && kill "$pid" >/dev/null 2>&1 && wait "$pid"' INT TERM ERR
if ((stake)); then if ((stake)); then
setup_vote_account "${leader_address%:*}" "$fullnode_id_path" "$fullnode_vote_id_path" "$stake" setup_vote_account "${leader_address%:*}" "$fullnode_id_path" "$fullnode_vote_id_path" "$stake"
@ -175,28 +175,28 @@ while true; do
oom_score_adj "$pid" 1000 oom_score_adj "$pid" 1000
set +x set +x
while true; do while true; do
if ! kill -0 "$pid"; then if ! kill -0 "$pid"; then
wait "$pid" wait "$pid"
exit 0 exit 0
fi fi
sleep 1 sleep 1
if ((poll_for_new_genesis_block)); then ((poll_for_new_genesis_block)) || continue
if ((!secs_to_next_genesis_poll)); then ((secs_to_next_genesis_poll--)) && continue
secs_to_next_genesis_poll=60
$rsync -r "$rsync_leader_url"/config/ledger "$SOLANA_RSYNC_CONFIG_DIR" || true
diff -q "$SOLANA_RSYNC_CONFIG_DIR"/ledger/genesis.json "$ledger_config_dir"/genesis.json >/dev/null 2>&1 || break
secs_to_next_genesis_poll=60
$rsync -r "$rsync_leader_url"/config/ledger "$SOLANA_RSYNC_CONFIG_DIR" || true
if [[ -n $(diff "$SOLANA_RSYNC_CONFIG_DIR"/ledger/genesis.json "$ledger_config_dir"/genesis.json 2>&1) ]]; then
echo "############## New genesis detected, restarting fullnode ##############"
kill "$pid" || true
wait "$pid" || true
rm -rf "$ledger_config_dir" "$accounts_config_dir" "$fullnode_vote_id_path".configured
break
fi
fi
((secs_to_next_genesis_poll--))
fi
done done
echo "############## New genesis detected, restarting fullnode ##############"
kill "$pid" || true
wait "$pid" || true
rm -rf "$ledger_config_dir" "$accounts_config_dir" "$fullnode_vote_id_path".configured
sleep 60 # give the network time to come back up
done done