diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh index 84bfe2caae0313..98ab0143a1f51e 100755 --- a/multinode-demo/validator.sh +++ b/multinode-demo/validator.sh @@ -147,7 +147,7 @@ while [[ -n $1 ]]; do elif [[ $1 = --skip-poh-verify ]]; then args+=("$1") shift - elif [[ $1 = --tpu-use-quic ]]; then + elif [[ $1 = --tpu-disable-quic ]]; then args+=("$1") shift elif [[ $1 = --rpc-send-batch-ms ]]; then diff --git a/net/net.sh b/net/net.sh index 418716c47b00ff..e77232330a7cb7 100755 --- a/net/net.sh +++ b/net/net.sh @@ -107,6 +107,10 @@ Operate a configured testnet - 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 + + --tpu-disable-quic + - Disable quic for tpu packet forwarding + sanity/start-specific options: -F - Discard validator nodes that didn't bootup successfully -o noInstallCheck - Skip solana-install sanity @@ -320,6 +324,7 @@ startBootstrapLeader() { \"$waitForNodeInit\" \ \"$extraPrimordialStakes\" \ \"$TMPFS_ACCOUNTS\" \ + \"$disableQuic\" \ " ) >> "$logFile" 2>&1 || { @@ -392,6 +397,7 @@ startNode() { \"$waitForNodeInit\" \ \"$extraPrimordialStakes\" \ \"$TMPFS_ACCOUNTS\" \ + \"$disableQuic\" \ " ) >> "$logFile" 2>&1 & declare pid=$! @@ -800,6 +806,7 @@ maybeWarpSlot= maybeFullRpc=false waitForNodeInit=true extraPrimordialStakes=0 +disableQuic=false command=$1 [[ -n $command ]] || usage @@ -912,6 +919,9 @@ while [[ -n $1 ]]; do elif [[ $1 == --full-rpc ]]; then maybeFullRpc=true shift 1 + elif [[ $1 == --tpu-disable-quic ]]; then + disableQuic=true + shift 1 elif [[ $1 == --async-node-init ]]; then waitForNodeInit=false shift 1 diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh index 2b93ffed145a66..b07429f24da1bf 100755 --- a/net/remote/remote-node.sh +++ b/net/remote/remote-node.sh @@ -28,6 +28,8 @@ maybeFullRpc="${19}" waitForNodeInit="${20}" extraPrimordialStakes="${21:=0}" tmpfsAccounts="${22:false}" +disableQuic="${23}" + set +x missing() { @@ -283,6 +285,11 @@ EOF args+=(--enable-extended-tx-metadata-storage) fi + + if $disableQuic; then + args+=(--tpu-disable-quic) + fi + if [[ $airdropsEnabled = true ]]; then cat >> ~/solana/on-reboot < faucet.log 2>&1 & @@ -411,6 +418,10 @@ EOF args+=(--enable-extended-tx-metadata-storage) fi + if $disableQuic; then + args+=(--tpu-disable-quic) + fi + cat >> ~/solana/on-reboot < validator.log.\$now 2>&1 &