v0.14: various net/ fixes for large clusters (#4080)

* net.sh: Add -F to discard validator nodes that didn't bootup successfully

* Relax sanity node count when validator bootup failure is permitted

* Less sanity for testnet-demo

* net.sh: Add -F to discard validator nodes that didn't bootup successfully
This commit is contained in:
Michael Vines
2019-04-29 21:38:03 -07:00
parent bd0871cbe7
commit d21fa4a177
7 changed files with 71 additions and 41 deletions

View File

@ -12,6 +12,7 @@ numNodes="$5"
RUST_LOG="$6"
skipSetup="$7"
leaderRotation="$8"
failOnValidatorBootupFailure="$9"
set +x
export RUST_LOG
@ -35,12 +36,14 @@ missing() {
[[ -n $numNodes ]] || missing numNodes
[[ -n $skipSetup ]] || missing skipSetup
[[ -n $leaderRotation ]] || missing leaderRotation
[[ -n $failOnValidatorBootupFailure ]] || missing failOnValidatorBootupFailure
cat > deployConfig <<EOF
deployMethod="$deployMethod"
entrypointIp="$entrypointIp"
numNodes="$numNodes"
leaderRotation=$leaderRotation
failOnValidatorBootupFailure=$failOnValidatorBootupFailure
EOF
source net/common.sh

View File

@ -9,6 +9,7 @@ cd "$(dirname "$0")"/../..
deployMethod=
entrypointIp=
numNodes=
failOnValidatorBootupFailure=
[[ -r deployConfig ]] || {
echo deployConfig missing
@ -26,6 +27,7 @@ missing() {
[[ -n $entrypointIp ]] || missing entrypointIp
[[ -n $numNodes ]] || missing numNodes
[[ -n $leaderRotation ]] || missing leaderRotation
[[ -n $failOnValidatorBootupFailure ]] || missing failOnValidatorBootupFailure
ledgerVerify=true
validatorSanity=true
@ -79,7 +81,17 @@ local|tar)
exit 1
esac
echo "+++ $entrypointIp: node count ($numNodes expected)"
if $failOnValidatorBootupFailure; then
numSanityNodes=1
if $rejectExtraNodes; then
echo "rejectExtraNodes cannot be used with failOnValidatorBootupFailure"
exit 1
fi
else
numSanityNodes="$numNodes"
fi
echo "+++ $entrypointIp: node count ($numSanityNodes expected)"
(
set -x
$solana_keygen -o "$client_id"
@ -90,7 +102,7 @@ echo "+++ $entrypointIp: node count ($numNodes expected)"
fi
timeout 2m $solana_gossip --network "$entrypointIp:8001" \
spy --$nodeArg "$numNodes" \
spy --$nodeArg "$numSanityNodes" \
)
echo "--- RPC API: getTransactionCount"