Remove unused --poll-for-new-genesis-config feature (#7093)

automerge
This commit is contained in:
Michael Vines
2019-11-22 09:12:08 -07:00
committed by Grimes
parent ce8d37984d
commit ef55c15537

View File

@ -36,7 +36,6 @@ EOF
args=() args=()
airdrops_enabled=1 airdrops_enabled=1
node_lamports=500000000000 # 500 SOL: number of lamports to airdrop the node for transaction fees (ignored if airdrops_enabled=0) node_lamports=500000000000 # 500 SOL: number of lamports to airdrop the node for transaction fees (ignored if airdrops_enabled=0)
poll_for_new_genesis_config=0
label= label=
identity_keypair_path= identity_keypair_path=
voting_keypair_path= voting_keypair_path=
@ -54,9 +53,6 @@ while [[ -n $1 ]]; do
elif [[ $1 = --no-restart ]]; then elif [[ $1 = --no-restart ]]; then
no_restart=1 no_restart=1
shift shift
elif [[ $1 = --poll-for-new-genesis-config ]]; then
poll_for_new_genesis_config=1
shift
elif [[ $1 = --node-lamports ]]; then elif [[ $1 = --node-lamports ]]; then
node_lamports="$2" node_lamports="$2"
shift 2 shift 2
@ -226,26 +222,6 @@ if [[ -z $CI ]]; then # Skip in CI
source "$here"/../scripts/tune-system.sh source "$here"/../scripts/tune-system.sh
fi fi
new_genesis_config() {
if [[ ! -d "$ledger_dir" ]]; then
return
fi
rm -f "$ledger_dir"/new-genesis.tar.bz2
(
set -x
curl -f "$rpc_url"/genesis.tar.bz2 -o "$ledger_dir"/new-genesis.tar.bz2
) || {
echo "Error: failed to fetch new genesis ledger"
rm -f "$ledger_dir"/new-genesis.tar.bz2
}
if [[ -f "$ledger_dir"/new-genesis.tar.bz2 ]]; then
diff -q "$ledger_dir"/new-genesis.tar.bz2 "$ledger_dir"/genesis.tar.bz2 >/dev/null 2>&1 && false
else
false
fi
}
set -e set -e
PS4="$(basename "$0"): " PS4="$(basename "$0"): "
@ -321,28 +297,12 @@ while true; do
exit $? exit $?
fi fi
secs_to_next_genesis_poll=60
while true; do while true; do
if [[ -z $pid ]] || ! kill -0 "$pid"; then if [[ -z $pid ]] || ! kill -0 "$pid"; then
echo "############## validator exited, restarting ##############" echo "############## validator exited, restarting ##############"
break break
fi fi
sleep 1 sleep 1
if ((poll_for_new_genesis_config && --secs_to_next_genesis_poll == 0)); then
echo "Polling for new genesis config..."
if new_genesis_config; then
echo "############## New genesis detected, restarting ##############"
(
set -x
rm -rf "$ledger_dir"
)
break
fi
secs_to_next_genesis_poll=60
fi
done done
kill_node kill_node