From a492de1bea3c319b148520e92daeef257fb3a040 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 01:14:06 +0000 Subject: [PATCH] Plumb accounts-db-skip-shrink through testnet scripts (backport #19290) (#19303) * Plumb accounts-db-skip-shrink through testnet scripts (#19290) (cherry picked from commit 1d375ff2da642ac9a24f4d1fe88160f37c4b24c5) # Conflicts: # multinode-demo/bootstrap-validator.sh # multinode-demo/validator.sh # net/net.sh * Fix conflicts Co-authored-by: Tyera Eulberg Co-authored-by: Tyera Eulberg --- 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 d0046af995..5edc6cc79c 100755 --- a/multinode-demo/bootstrap-validator.sh +++ b/multinode-demo/bootstrap-validator.sh @@ -75,6 +75,9 @@ while [[ -n $1 ]]; do elif [[ $1 == --maximum-snapshots-to-retain ]]; then args+=("$1" "$2") shift 2 + elif [[ $1 == --accounts-db-skip-shrink ]]; then + args+=("$1") + shift else echo "Unknown argument: $1" $program --help diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh index 224300954c..fc99573402 100755 --- a/multinode-demo/validator.sh +++ b/multinode-demo/validator.sh @@ -155,6 +155,9 @@ while [[ -n $1 ]]; do elif [[ $1 == --expected-bank-hash ]]; then args+=("$1" "$2") shift 2 + elif [[ $1 == --accounts-db-skip-shrink ]]; then + args+=("$1") + shift elif [[ $1 = -h ]]; then usage "$@" else diff --git a/net/net.sh b/net/net.sh index 3dbf78e6ec..82da111b38 100755 --- a/net/net.sh +++ b/net/net.sh @@ -309,7 +309,7 @@ startBootstrapLeader() { ${#clientIpList[@]} \"$benchTpsExtraArgs\" \ ${#clientIpList[@]} \"$benchExchangeExtraArgs\" \ \"$genesisOptions\" \ - \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \ + \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAccountsDbSkipShrink\" \ \"$gpuMode\" \ \"$maybeWarpSlot\" \ \"$waitForNodeInit\" \ @@ -381,7 +381,7 @@ startNode() { ${#clientIpList[@]} \"$benchTpsExtraArgs\" \ ${#clientIpList[@]} \"$benchExchangeExtraArgs\" \ \"$genesisOptions\" \ - \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \ + \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAccountsDbSkipShrink\" \ \"$gpuMode\" \ \"$maybeWarpSlot\" \ \"$waitForNodeInit\" \ @@ -782,6 +782,7 @@ maybeLimitLedgerSize="" maybeSkipLedgerVerify="" maybeDisableAirdrops="" maybeWaitForSupermajority="" +maybeAccountsDbSkipShrink="" debugBuild=false doBuild=true gpuMode=auto @@ -906,6 +907,9 @@ while [[ -n $1 ]]; do elif [[ $1 == --extra-primordial-stakes ]]; then extraPrimordialStakes=$2 shift 2 + elif [[ $1 = --accounts-db-skip-shrink ]]; then + maybeAccountsDbSkipShrink="$1" + shift 1 else usage "Unknown long option: $1" fi