Enable easy full-rpc services on testnet nodes (#20530) (#20532)

(cherry picked from commit afe866ad02)

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
This commit is contained in:
mergify[bot]
2021-10-08 03:02:48 +00:00
committed by GitHub
parent b48bfc19c1
commit 8f07b46a69
2 changed files with 22 additions and 3 deletions

View File

@ -106,6 +106,8 @@ Operate a configured testnet
- Override the number of slots in an epoch - Override the number of slots in an epoch
--warp-slot WARP_SLOT --warp-slot WARP_SLOT
- Boot from a snapshot that has warped ahead to WARP_SLOT rather than a slot 0 genesis. - Boot from a snapshot that has warped ahead to WARP_SLOT rather than a slot 0 genesis.
--full-rpc
- Support full RPC services on all nodes
sanity/start-specific options: sanity/start-specific options:
-F - Discard validator nodes that didn't bootup successfully -F - Discard validator nodes that didn't bootup successfully
-o noInstallCheck - Skip solana-install sanity -o noInstallCheck - Skip solana-install sanity
@ -312,6 +314,7 @@ startBootstrapLeader() {
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \ \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
\"$gpuMode\" \ \"$gpuMode\" \
\"$maybeWarpSlot\" \ \"$maybeWarpSlot\" \
\"$maybeFullRpc\" \
\"$waitForNodeInit\" \ \"$waitForNodeInit\" \
\"$extraPrimordialStakes\" \ \"$extraPrimordialStakes\" \
\"$TMPFS_ACCOUNTS\" \ \"$TMPFS_ACCOUNTS\" \
@ -384,6 +387,7 @@ startNode() {
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \ \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
\"$gpuMode\" \ \"$gpuMode\" \
\"$maybeWarpSlot\" \ \"$maybeWarpSlot\" \
\"$maybeFullRpc\" \
\"$waitForNodeInit\" \ \"$waitForNodeInit\" \
\"$extraPrimordialStakes\" \ \"$extraPrimordialStakes\" \
\"$TMPFS_ACCOUNTS\" \ \"$TMPFS_ACCOUNTS\" \
@ -795,6 +799,7 @@ netemCommand="add"
clientDelayStart=0 clientDelayStart=0
netLogDir= netLogDir=
maybeWarpSlot= maybeWarpSlot=
maybeFullRpc=false
waitForNodeInit=true waitForNodeInit=true
extraPrimordialStakes=0 extraPrimordialStakes=0
@ -903,6 +908,9 @@ while [[ -n $1 ]]; do
elif [[ $1 == --warp-slot ]]; then elif [[ $1 == --warp-slot ]]; then
maybeWarpSlot="$1 $2" maybeWarpSlot="$1 $2"
shift 2 shift 2
elif [[ $1 == --full-rpc ]]; then
maybeFullRpc=true
shift 1
elif [[ $1 == --async-node-init ]]; then elif [[ $1 == --async-node-init ]]; then
waitForNodeInit=false waitForNodeInit=false
shift 1 shift 1

View File

@ -26,9 +26,10 @@ genesisOptions="${17}"
extraNodeArgs="${18}" extraNodeArgs="${18}"
gpuMode="${19:-auto}" gpuMode="${19:-auto}"
maybeWarpSlot="${20}" maybeWarpSlot="${20}"
waitForNodeInit="${21}" maybeFullRpc="${21}"
extraPrimordialStakes="${22:=0}" waitForNodeInit="${22}"
tmpfsAccounts="${23:false}" extraPrimordialStakes="${23:=0}"
tmpfsAccounts="${24:false}"
set +x set +x
missing() { missing() {
@ -286,6 +287,11 @@ EOF
args+=(--accounts /mnt/solana-accounts) args+=(--accounts /mnt/solana-accounts)
fi fi
if $maybeFullRpc; then
args+=(--enable-rpc-transaction-history)
args+=(--enable-cpi-and-log-storage)
fi
if [[ $airdropsEnabled = true ]]; then if [[ $airdropsEnabled = true ]]; then
cat >> ~/solana/on-reboot <<EOF cat >> ~/solana/on-reboot <<EOF
./multinode-demo/faucet.sh > faucet.log 2>&1 & ./multinode-demo/faucet.sh > faucet.log 2>&1 &
@ -409,6 +415,11 @@ EOF
args+=(--accounts /mnt/solana-accounts) args+=(--accounts /mnt/solana-accounts)
fi fi
if $maybeFullRpc; then
args+=(--enable-rpc-transaction-history)
args+=(--enable-cpi-and-log-storage)
fi
cat >> ~/solana/on-reboot <<EOF cat >> ~/solana/on-reboot <<EOF
$maybeSkipAccountsCreation $maybeSkipAccountsCreation
nohup multinode-demo/validator.sh ${args[@]} > validator.log.\$now 2>&1 & nohup multinode-demo/validator.sh ${args[@]} > validator.log.\$now 2>&1 &