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

Add --poll-for-new-genesis-block flag

Browse Source
This commit is contained in:
Michael Vines
2019-03-21 23:18:19 -07:00
committed by Grimes
parent 8655df0520
commit bdee3a25f2
1 changed files with 62 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
multinode-demo/fullnode.sh
View File

@ -16,7 +16,8 @@ fi
gossip_port=9000 gossip_port=9000
extra_fullnode_args=() extra_fullnode_args=()
self_setup=0 self_setup=0
setup_stakes=true setup_stakes=1
poll_for_new_genesis_block=0
while [[ ${1:0:1} = - ]]; do while [[ ${1:0:1} = - ]]; do
if [[ $1 = -X ]]; then if [[ $1 = -X ]]; then
@ -27,6 +28,9 @@ while [[ ${1:0:1} = - ]]; do
self_setup=1 self_setup=1
self_setup_label=$$ self_setup_label=$$
shift shift
elif [[ $1 = --poll-for-new-genesis-block ]]; then
poll_for_new_genesis_block=1
shift
elif [[ $1 = --blockstream ]]; then elif [[ $1 = --blockstream ]]; then
extra_fullnode_args+=("$1" "$2") extra_fullnode_args+=("$1" "$2")
shift 2 shift 2
@ -37,7 +41,7 @@ while [[ ${1:0:1} = - ]]; do
extra_fullnode_args+=("$1" "$2") extra_fullnode_args+=("$1" "$2")
shift 2 shift 2
elif [[ $1 = --only-bootstrap-stake ]]; then elif [[ $1 = --only-bootstrap-stake ]]; then
setup_stakes=false setup_stakes=0
shift shift
elif [[ $1 = --public-address ]]; then elif [[ $1 = --public-address ]]; then
extra_fullnode_args+=("$1") extra_fullnode_args+=("$1")
@ -66,7 +70,7 @@ find_leader() {
declare shift=0 declare shift=0
if [[ -z $1 ]]; then if [[ -z $1 ]]; then
leader=${here}/.. # Default to local tree for rsync leader=$PWD # Default to local tree for rsync
leader_address=127.0.0.1:8001 # Default to local leader leader_address=127.0.0.1:8001 # Default to local leader
elif [[ -z $2 ]]; then elif [[ -z $2 ]]; then
leader=$1 leader=$1
@ -169,7 +173,12 @@ rsync_url() { # adds the 'rsync://` prefix to URLs that need it
rsync_leader_url=$(rsync_url "$leader") rsync_leader_url=$(rsync_url "$leader")
set -ex set -e
secs_to_next_genesis_poll=0
PS4="$(basename "$0"): "
while true; do
set -x
if [[ ! -d "$SOLANA_RSYNC_CONFIG_DIR"/ledger ]]; then if [[ ! -d "$SOLANA_RSYNC_CONFIG_DIR"/ledger ]]; then
$rsync -vPr "$rsync_leader_url"/config/ledger "$SOLANA_RSYNC_CONFIG_DIR" $rsync -vPr "$rsync_leader_url"/config/ledger "$SOLANA_RSYNC_CONFIG_DIR"
fi fi
@ -194,8 +203,32 @@ $program \
pid=$! pid=$!
oom_score_adj "$pid" 1000 oom_score_adj "$pid" 1000
if [[ $setup_stakes = true ]]; then if ((setup_stakes)); then
setup_fullnode_staking "${leader_address%:*}" "$fullnode_id_path" "$fullnode_staker_id_path" setup_fullnode_staking "${leader_address%:*}" "$fullnode_id_path" "$fullnode_staker_id_path"
fi fi
set +x
while true; do
if ! kill -0 "$pid"; then
wait "$pid" wait "$pid"
exit 0
fi
sleep 1
if ((poll_for_new_genesis_block)); then
if ((!secs_to_next_genesis_poll)); then
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 ##############"
rm -rf "$ledger_config_dir"
kill "$pid" || true
wait "$pid" || true
break
fi
fi
((secs_to_next_genesis_poll--))
fi
done
done