parent
67d1e2903c
commit
09e8124017
32
net/net.sh
32
net/net.sh
|
@ -88,8 +88,6 @@ Operate a configured testnet
|
||||||
|
|
||||||
--use-move - Build the move-loader-program and add it to the cluster
|
--use-move - Build the move-loader-program and add it to the cluster
|
||||||
|
|
||||||
--netem - Use netem to induce packet drops/latencies/errors
|
|
||||||
|
|
||||||
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
|
||||||
|
@ -101,6 +99,10 @@ Operate a configured testnet
|
||||||
logs-specific options:
|
logs-specific options:
|
||||||
none
|
none
|
||||||
|
|
||||||
|
netem-specific options:
|
||||||
|
--config - Netem configuration (as a double quoted string)
|
||||||
|
--parition - Percentage of network that should be configured with netem
|
||||||
|
|
||||||
update-specific options:
|
update-specific options:
|
||||||
--platform linux|osx|windows - Deploy the tarball using 'solana-install deploy ...' for the
|
--platform linux|osx|windows - Deploy the tarball using 'solana-install deploy ...' for the
|
||||||
given platform (multiple platforms may be specified)
|
given platform (multiple platforms may be specified)
|
||||||
|
@ -143,6 +145,7 @@ debugBuild=false
|
||||||
doBuild=true
|
doBuild=true
|
||||||
gpuMode=auto
|
gpuMode=auto
|
||||||
maybeUseMove=""
|
maybeUseMove=""
|
||||||
|
netemPartition=""
|
||||||
netemConfig=""
|
netemConfig=""
|
||||||
|
|
||||||
command=$1
|
command=$1
|
||||||
|
@ -207,7 +210,10 @@ while [[ -n $1 ]]; do
|
||||||
elif [[ $1 = --use-move ]]; then
|
elif [[ $1 = --use-move ]]; then
|
||||||
maybeUseMove=$1
|
maybeUseMove=$1
|
||||||
shift 1
|
shift 1
|
||||||
elif [[ $1 = --netem ]]; then
|
elif [[ $1 = --partition ]]; then
|
||||||
|
netemPartition=$2
|
||||||
|
shift 2
|
||||||
|
elif [[ $1 = --config ]]; then
|
||||||
netemConfig=$2
|
netemConfig=$2
|
||||||
shift 2
|
shift 2
|
||||||
elif [[ $1 = --gpu-mode ]]; then
|
elif [[ $1 = --gpu-mode ]]; then
|
||||||
|
@ -465,7 +471,6 @@ startBootstrapLeader() {
|
||||||
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize\" \
|
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize\" \
|
||||||
\"$gpuMode\" \
|
\"$gpuMode\" \
|
||||||
\"$GEOLOCATION_API_KEY\" \
|
\"$GEOLOCATION_API_KEY\" \
|
||||||
\"$netemConfig\" \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
) >> "$logFile" 2>&1 || {
|
) >> "$logFile" 2>&1 || {
|
||||||
|
@ -533,7 +538,6 @@ startNode() {
|
||||||
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize\" \
|
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize\" \
|
||||||
\"$gpuMode\" \
|
\"$gpuMode\" \
|
||||||
\"$GEOLOCATION_API_KEY\" \
|
\"$GEOLOCATION_API_KEY\" \
|
||||||
\"$netemConfig\" \
|
|
||||||
"
|
"
|
||||||
) >> "$logFile" 2>&1 &
|
) >> "$logFile" 2>&1 &
|
||||||
declare pid=$!
|
declare pid=$!
|
||||||
|
@ -962,7 +966,25 @@ logs)
|
||||||
fetchRemoteLog "$ipAddress" validator
|
fetchRemoteLog "$ipAddress" validator
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
|
netem)
|
||||||
|
num_nodes=$((${#validatorIpList[@]}*netemPartition/100))
|
||||||
|
if [[ $((${#validatorIpList[@]}*netemPartition%100)) -gt 0 ]]; then
|
||||||
|
num_nodes=$((num_nodes+1))
|
||||||
|
fi
|
||||||
|
if [[ "$num_nodes" -gt "${#validatorIpList[@]}" ]]; then
|
||||||
|
num_nodes=${#validatorIpList[@]}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Stop netem on all nodes
|
||||||
|
for ipAddress in "${validatorIpList[@]}"; do
|
||||||
|
"$here"/ssh.sh solana@"$ipAddress" 'solana/scripts/netem.sh delete < solana/netem.cfg || true'
|
||||||
|
done
|
||||||
|
|
||||||
|
# Start netem on required nodes
|
||||||
|
for ((i=0; i<num_nodes; i++ )); do :
|
||||||
|
"$here"/ssh.sh solana@"${validatorIpList[$i]}" "echo $netemConfig > solana/netem.cfg; solana/scripts/netem.sh add \"$netemConfig\""
|
||||||
|
done
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Internal error: Unknown command: $command"
|
echo "Internal error: Unknown command: $command"
|
||||||
usage
|
usage
|
||||||
|
|
|
@ -26,7 +26,6 @@ genesisOptions="${17}"
|
||||||
extraNodeArgs="${18}"
|
extraNodeArgs="${18}"
|
||||||
gpuMode="${19:-auto}"
|
gpuMode="${19:-auto}"
|
||||||
GEOLOCATION_API_KEY="${20}"
|
GEOLOCATION_API_KEY="${20}"
|
||||||
netemConfig="${21}"
|
|
||||||
set +x
|
set +x
|
||||||
|
|
||||||
# Use a very large stake (relative to the default multinode-demo/ stake of 42)
|
# Use a very large stake (relative to the default multinode-demo/ stake of 42)
|
||||||
|
@ -148,11 +147,6 @@ cat >> ~/solana/on-reboot <<EOF
|
||||||
echo "Expected GPU, found none!"
|
echo "Expected GPU, found none!"
|
||||||
export SOLANA_GPU_MISSING=1
|
export SOLANA_GPU_MISSING=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "$netemConfig" ]]; then
|
|
||||||
scripts/netem.sh add "$netemConfig"
|
|
||||||
echo "$netemConfig" > netem.cfg
|
|
||||||
fi
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
case $nodeType in
|
case $nodeType in
|
||||||
|
|
Loading…
Reference in New Issue