From 348bf78cd109de8779e89a7978fba186b04a0e9a Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Mon, 15 Jun 2020 19:52:44 -0600 Subject: [PATCH] Plumb --wait-for-supermajority through scripts (#10611) --- multinode-demo/bootstrap-validator.sh | 3 +++ multinode-demo/validator.sh | 3 +++ net/net.sh | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/multinode-demo/bootstrap-validator.sh b/multinode-demo/bootstrap-validator.sh index fe8d4bc786..e19639384c 100755 --- a/multinode-demo/bootstrap-validator.sh +++ b/multinode-demo/bootstrap-validator.sh @@ -57,6 +57,9 @@ while [[ -n $1 ]]; do elif [[ $1 = --no-restart ]]; then no_restart=1 shift + elif [[ $1 == --wait-for-supermajority ]]; then + args+=("$1" "$2") + shift 2 else echo "Unknown argument: $1" $program --help diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh index 0505cacbbe..222815ec69 100755 --- a/multinode-demo/validator.sh +++ b/multinode-demo/validator.sh @@ -148,6 +148,9 @@ while [[ -n $1 ]]; do elif [[ $1 = --max-genesis-archive-unpacked-size ]]; then args+=("$1" "$2") shift 2 + elif [[ $1 == --wait-for-supermajority ]]; then + args+=("$1" "$2") + shift 2 elif [[ $1 = -h ]]; then usage "$@" else diff --git a/net/net.sh b/net/net.sh index 7d09df8a96..96659eb1a6 100755 --- a/net/net.sh +++ b/net/net.sh @@ -281,7 +281,7 @@ startBootstrapLeader() { ${#clientIpList[@]} \"$benchTpsExtraArgs\" \ ${#clientIpList[@]} \"$benchExchangeExtraArgs\" \ \"$genesisOptions\" \ - \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize\" \ + \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \ \"$gpuMode\" \ \"$GEOLOCATION_API_KEY\" \ " @@ -350,7 +350,7 @@ startNode() { ${#clientIpList[@]} \"$benchTpsExtraArgs\" \ ${#clientIpList[@]} \"$benchExchangeExtraArgs\" \ \"$genesisOptions\" \ - \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize\" \ + \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \ \"$gpuMode\" \ \"$GEOLOCATION_API_KEY\" \ " @@ -733,6 +733,7 @@ maybeNoSnapshot="" maybeLimitLedgerSize="" maybeSkipLedgerVerify="" maybeDisableAirdrops="" +maybeWaitForSupermajority="" debugBuild=false doBuild=true gpuMode=auto @@ -843,6 +844,9 @@ while [[ -n $1 ]]; do elif [[ $1 == --client-delay-start ]]; then clientDelayStart=$2 shift 2 + elif [[ $1 == --wait-for-supermajority ]]; then + maybeWaitForSupermajority="$1 $2" + shift 2 else usage "Unknown long option: $1" fi