Remove validator sanity check (#6435)

automerge
This commit is contained in:
Michael Vines
2019-10-18 08:26:08 -07:00
committed by Grimes
parent 9cf9de6044
commit 6f58bdfcb1
5 changed files with 40 additions and 86 deletions

View File

@ -87,7 +87,6 @@ Operate a configured testnet
sanity/start-specific options:
-F - Discard validator nodes that didn't bootup successfully
-o noValidatorSanity - Skip fullnode sanity
-o noInstallCheck - Skip solana-install sanity
-o rejectExtraNodes - Require the exact number of nodes
@ -246,7 +245,7 @@ while getopts "h?T:t:o:f:rD:c:Fn:i:d" opt "${shortArgs[@]}"; do
;;
o)
case $OPTARG in
noValidatorSanity|rejectExtraNodes|noInstallCheck)
rejectExtraNodes|noInstallCheck)
sanityExtraArgs="$sanityExtraArgs -o $OPTARG"
;;
*)
@ -562,7 +561,7 @@ sanity() {
set -x
# shellcheck disable=SC2029 # remote-client.sh args are expanded on client side intentionally
ssh "${sshOptions[@]}" "$blockstreamer" \
"./solana/net/remote/remote-sanity.sh $blockstreamer $sanityExtraArgs -o noValidatorSanity \"$RUST_LOG\""
"./solana/net/remote/remote-sanity.sh $blockstreamer $sanityExtraArgs \"$RUST_LOG\""
) || ok=false
$ok || exit 1
fi

View File

@ -33,16 +33,12 @@ missing() {
[[ -n $numNodes ]] || missing numNodes
[[ -n $failOnValidatorBootupFailure ]] || missing failOnValidatorBootupFailure
validatorSanity=true
installCheck=true
rejectExtraNodes=false
while [[ $1 = -o ]]; do
opt="$2"
shift 2
case $opt in
noValidatorSanity)
validatorSanity=false
;;
noInstallCheck)
installCheck=false
;;
@ -129,29 +125,6 @@ else
echo "Note: wallet sanity is disabled as airdrops are disabled"
fi
echo "--- $sanityTargetIp: validator sanity"
if $validatorSanity; then
(
set -x -o pipefail
timeout 10s ./multinode-demo/validator-x.sh \
--no-restart --entrypoint "$sanityTargetIp:8001" 2>&1 | tee validator-sanity.log
) || {
exitcode=$?
[[ $exitcode -eq 124 ]] || exit $exitcode
}
wc -l validator-sanity.log
if grep -C100 panic validator-sanity.log; then
echo "^^^ +++"
echo "Panic observed"
exit 1
else
echo "Validator sanity log looks ok"
fi
else
echo "^^^ +++"
echo "Note: validator sanity disabled"
fi
if $installCheck && [[ -r update_manifest_keypair.json ]]; then
echo "--- $sanityTargetIp: solana-install test"