Plumb accounts-db-skip-shrink through testnet scripts (#19290)

(cherry picked from commit 1d375ff) # Conflicts: # multinode-demo/bootstrap-validator.sh # multinode-demo/validator.sh # net/net.sh
solana-labs · Aug 18, 2021 · 0851b50 · 0851b50
1 parent 43b414b
commit 0851b50
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/multinode-demo/bootstrap-validator.sh b/multinode-demo/bootstrap-validator.sh
@@ -75,6 +75,18 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --maximum-snapshots-to-retain ]]; then
       args+=("$1" "$2")
       shift 2
+<<<<<<< HEAD
+=======
+    elif [[ $1 == --no-snapshot-fetch ]]; then
+      args+=("$1")
+      shift
+    elif [[ $1 == --allow-private-addr ]]; then
+      args+=("$1")
+      shift
+    elif [[ $1 == --accounts-db-skip-shrink ]]; then
+      args+=("$1")
+      shift
+>>>>>>> 1d375ff2d (Plumb accounts-db-skip-shrink through testnet scripts (#19290))
     else
       echo "Unknown argument: $1"
       $program --help

diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh
@@ -155,6 +155,16 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --expected-bank-hash ]]; then
       args+=("$1" "$2")
       shift 2
+<<<<<<< HEAD
+=======
+    elif [[ $1 == --allow-private-addr ]]; then
+      args+=("$1")
+      maybe_allow_private_addr=$1
+      shift
+    elif [[ $1 == --accounts-db-skip-shrink ]]; then
+      args+=("$1")
+      shift
+>>>>>>> 1d375ff2d (Plumb accounts-db-skip-shrink through testnet scripts (#19290))
     elif [[ $1 = -h ]]; then
       usage "$@"
     else

diff --git a/net/net.sh b/net/net.sh
@@ -309,7 +309,11 @@ startBootstrapLeader() {
          ${#clientIpList[@]} \"$benchTpsExtraArgs\" \
          ${#clientIpList[@]} \"$benchExchangeExtraArgs\" \
          \"$genesisOptions\" \
+<<<<<<< HEAD
          \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \
+=======
+         \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink\" \
+>>>>>>> 1d375ff2d (Plumb accounts-db-skip-shrink through testnet scripts (#19290))
          \"$gpuMode\" \
          \"$maybeWarpSlot\" \
          \"$waitForNodeInit\" \
@@ -381,7 +385,11 @@ startNode() {
          ${#clientIpList[@]} \"$benchTpsExtraArgs\" \
          ${#clientIpList[@]} \"$benchExchangeExtraArgs\" \
          \"$genesisOptions\" \
+<<<<<<< HEAD
          \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \
+=======
+         \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink\" \
+>>>>>>> 1d375ff2d (Plumb accounts-db-skip-shrink through testnet scripts (#19290))
          \"$gpuMode\" \
          \"$maybeWarpSlot\" \
          \"$waitForNodeInit\" \
@@ -782,6 +790,11 @@ maybeLimitLedgerSize=""
 maybeSkipLedgerVerify=""
 maybeDisableAirdrops=""
 maybeWaitForSupermajority=""
+<<<<<<< HEAD
+=======
+maybeAllowPrivateAddr=""
+maybeAccountsDbSkipShrink=""
+>>>>>>> 1d375ff2d (Plumb accounts-db-skip-shrink through testnet scripts (#19290))
 debugBuild=false
 doBuild=true
 gpuMode=auto
@@ -906,6 +919,17 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --extra-primordial-stakes ]]; then
       extraPrimordialStakes=$2
       shift 2
+<<<<<<< HEAD
+=======
+    elif [[ $1 = --allow-private-addr ]]; then
+      # May also be added by loadConfigFile if 'gce.sh create' was invoked
+      # without -P.
+      maybeAllowPrivateAddr="$1"
+      shift 1
+    elif [[ $1 = --accounts-db-skip-shrink ]]; then
+      maybeAccountsDbSkipShrink="$1"
+      shift 1
+>>>>>>> 1d375ff2d (Plumb accounts-db-skip-shrink through testnet scripts (#19290))
     else
       usage "Unknown long option: $1"
     fi