From 6f58bdfcb1855f61bc1307b048faa94c9c17bd6c Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 18 Oct 2019 08:26:08 -0700
Subject: [PATCH] Remove validator sanity check (#6435)

automerge
---
 ci/testnet-deploy.sh        |  3 --
 ci/testnet-manager.sh       | 90 ++++++++++++++++---------------------
 ci/testnet-sanity.sh        |  1 -
 net/net.sh                  |  5 +--
 net/remote/remote-sanity.sh | 27 -----------
 5 files changed, 40 insertions(+), 86 deletions(-)

diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh
index 297035a183..6efc7136d4 100755
--- a/ci/testnet-deploy.sh
+++ b/ci/testnet-deploy.sh
@@ -371,9 +371,6 @@ if ! $skipStart; then
     if ! $publicNetwork; then
       args+=(-o rejectExtraNodes)
     fi
-    if [[ -n $NO_VALIDATOR_SANITY ]]; then
-      args+=(-o noValidatorSanity)
-    fi
     if [[ -n $NO_INSTALL_CHECK ]]; then
       args+=(-o noInstallCheck)
     fi
diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh
index 5c1ea28371..2e08ebbde6 100755
--- a/ci/testnet-manager.sh
+++ b/ci/testnet-manager.sh
@@ -231,7 +231,6 @@ sanity() {
     (
       set -x
       NO_INSTALL_CHECK=1 \
-      NO_VALIDATOR_SANITY=1 \
         ci/testnet-sanity.sh edge-testnet-solana-com gce -P us-west1-b
       maybe_deploy_software
     )
@@ -240,7 +239,6 @@ sanity() {
     (
       set -x
       REJECT_EXTRA_NODES=1 \
-      NO_VALIDATOR_SANITY=1 \
         ci/testnet-sanity.sh edge-perf-testnet-solana-com ec2 us-west-2b
     )
     ;;
@@ -248,7 +246,6 @@ sanity() {
     (
       set -x
       NO_INSTALL_CHECK=1 \
-      NO_VALIDATOR_SANITY=1 \
         ci/testnet-sanity.sh beta-testnet-solana-com gce us-west1-b
       maybe_deploy_software --deploy-if-newer
     )
@@ -257,22 +254,19 @@ sanity() {
     (
       set -x
       REJECT_EXTRA_NODES=1 \
-      NO_VALIDATOR_SANITY=1 \
         ci/testnet-sanity.sh beta-perf-testnet-solana-com ec2 us-west-2b
     )
     ;;
   testnet)
     (
       set -x
-      NO_VALIDATOR_SANITY=1 \
-        ci/testnet-sanity.sh testnet-solana-com gce us-west1-b
+      ci/testnet-sanity.sh testnet-solana-com gce us-west1-b
     )
     ;;
   testnet-perf)
     (
       set -x
       REJECT_EXTRA_NODES=1 \
-      NO_VALIDATOR_SANITY=1 \
         ci/testnet-sanity.sh perf-testnet-solana-com gce us-west1-b
       #ci/testnet-sanity.sh perf-testnet-solana-com ec2 us-east-1a
     )
@@ -283,8 +277,7 @@ sanity() {
 
       ok=true
       if [[ -n $GCE_NODE_COUNT ]]; then
-        NO_VALIDATOR_SANITY=1 \
-          ci/testnet-sanity.sh demo-testnet-solana-com gce "${GCE_ZONES[0]}" -f || ok=false
+        ci/testnet-sanity.sh demo-testnet-solana-com gce "${GCE_ZONES[0]}" -f || ok=false
       else
         echo "Error: no GCE nodes"
         ok=false
@@ -295,8 +288,7 @@ sanity() {
   tds)
     (
       set -x
-      NO_VALIDATOR_SANITY=1 \
-        ci/testnet-sanity.sh tds-solana-com gce "${GCE_ZONES[0]}" -f
+      ci/testnet-sanity.sh tds-solana-com gce "${GCE_ZONES[0]}" -f
     )
     ;;
   *)
@@ -345,7 +337,6 @@ deploy() {
   testnet-edge-perf)
     (
       set -x
-      NO_VALIDATOR_SANITY=1 \
       RUST_LOG=solana=warn \
         ci/testnet-deploy.sh -p edge-perf-testnet-solana-com -C ec2 -z us-west-2b \
           -g -t "$CHANNEL_OR_TAG" -c 2 \
@@ -371,7 +362,6 @@ deploy() {
   testnet-beta-perf)
     (
       set -x
-      NO_VALIDATOR_SANITY=1 \
       RUST_LOG=solana=warn \
         ci/testnet-deploy.sh -p beta-perf-testnet-solana-com -C ec2 -z us-west-2b \
           -g -t "$CHANNEL_OR_TAG" -c 2 \
@@ -402,7 +392,6 @@ deploy() {
   testnet-perf)
     (
       set -x
-      NO_VALIDATOR_SANITY=1 \
       RUST_LOG=solana=warn \
         ci/testnet-deploy.sh -p perf-testnet-solana-com -C gce -z us-west1-b \
           -G "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100" \
@@ -423,26 +412,24 @@ deploy() {
       fi
 
       # shellcheck disable=SC2068
-      NO_VALIDATOR_SANITY=1 \
-        ci/testnet-deploy.sh -p demo-testnet-solana-com -C gce ${GCE_ZONE_ARGS[@]} \
-          -t "$CHANNEL_OR_TAG" -n "$GCE_NODE_COUNT" -c 0 -P -u --allow-boot-failures \
-          --skip-remote-log-retrieval \
-          -a demo-testnet-solana-com \
-          ${skipCreate:+-e} \
-          ${maybeSkipStart:+-s} \
-          ${maybeStop:+-S} \
-          ${maybeDelete:+-D}
+      ci/testnet-deploy.sh -p demo-testnet-solana-com -C gce ${GCE_ZONE_ARGS[@]} \
+        -t "$CHANNEL_OR_TAG" -n "$GCE_NODE_COUNT" -c 0 -P -u --allow-boot-failures \
+        --skip-remote-log-retrieval \
+        -a demo-testnet-solana-com \
+        ${skipCreate:+-e} \
+        ${maybeSkipStart:+-s} \
+        ${maybeStop:+-S} \
+        ${maybeDelete:+-D}
 
       if [[ -n $GCE_LOW_QUOTA_NODE_COUNT ]]; then
         # shellcheck disable=SC2068
-        NO_VALIDATOR_SANITY=1 \
-          ci/testnet-deploy.sh -p demo-testnet-solana-com2 -C gce ${GCE_LOW_QUOTA_ZONE_ARGS[@]} \
-            -t "$CHANNEL_OR_TAG" -n "$GCE_LOW_QUOTA_NODE_COUNT" -c 0 -P --allow-boot-failures -x \
-            --skip-remote-log-retrieval \
-            ${skipCreate:+-e} \
-            ${skipStart:+-s} \
-            ${maybeStop:+-S} \
-            ${maybeDelete:+-D}
+        ci/testnet-deploy.sh -p demo-testnet-solana-com2 -C gce ${GCE_LOW_QUOTA_ZONE_ARGS[@]} \
+          -t "$CHANNEL_OR_TAG" -n "$GCE_LOW_QUOTA_NODE_COUNT" -c 0 -P --allow-boot-failures -x \
+          --skip-remote-log-retrieval \
+          ${skipCreate:+-e} \
+          ${skipStart:+-s} \
+          ${maybeStop:+-S} \
+          ${maybeDelete:+-D}
       fi
     )
     ;;
@@ -539,27 +526,26 @@ deploy() {
       # Multiple V100 GPUs are available in us-west1, us-central1 and europe-west4
       # shellcheck disable=SC2068
       # shellcheck disable=SC2086
-      NO_VALIDATOR_SANITY=1 \
-        ci/testnet-deploy.sh -p tds-solana-com -C gce \
-          "${maybeGpu[@]}" \
-          -d pd-ssd \
-          ${GCE_CLOUD_ZONES[@]/#/-z } \
-          -t "$CHANNEL_OR_TAG" \
-          -n ${TDS_NODE_COUNT} \
-          -c ${TDS_CLIENT_COUNT} \
-          -P -u \
-          -a tds-solana-com --letsencrypt tds.solana.com \
-          ${maybeHashesPerTick} \
-          ${skipCreate:+-e} \
-          ${skipStart:+-s} \
-          ${maybeStop:+-S} \
-          ${maybeDelete:+-D} \
-          ${maybeDisableAirdrops} \
-          ${maybeInternalNodesStakeLamports} \
-          ${maybeInternalNodesLamports} \
-          ${maybeExternalAccountsFile} \
-          ${maybeLamports} \
-          ${maybeAdditionalDisk}
+      ci/testnet-deploy.sh -p tds-solana-com -C gce \
+        "${maybeGpu[@]}" \
+        -d pd-ssd \
+        ${GCE_CLOUD_ZONES[@]/#/-z } \
+        -t "$CHANNEL_OR_TAG" \
+        -n ${TDS_NODE_COUNT} \
+        -c ${TDS_CLIENT_COUNT} \
+        -P -u \
+        -a tds-solana-com --letsencrypt tds.solana.com \
+        ${maybeHashesPerTick} \
+        ${skipCreate:+-e} \
+        ${skipStart:+-s} \
+        ${maybeStop:+-S} \
+        ${maybeDelete:+-D} \
+        ${maybeDisableAirdrops} \
+        ${maybeInternalNodesStakeLamports} \
+        ${maybeInternalNodesLamports} \
+        ${maybeExternalAccountsFile} \
+        ${maybeLamports} \
+        ${maybeAdditionalDisk}
     )
     ;;
   *)
diff --git a/ci/testnet-sanity.sh b/ci/testnet-sanity.sh
index e7e6c971a3..f3703af9e4 100755
--- a/ci/testnet-sanity.sh
+++ b/ci/testnet-sanity.sh
@@ -67,7 +67,6 @@ for zone in "$@"; do
   echo "--- net.sh sanity [$cloudProvider:$zone]"
   ok=true
   timeout 5m net/net.sh sanity \
-    ${NO_VALIDATOR_SANITY:+-o noValidatorSanity} \
     ${REJECT_EXTRA_NODES:+-o rejectExtraNodes} \
     ${NO_INSTALL_CHECK:+-o noInstallCheck} \
     $zone || ok=false
diff --git a/net/net.sh b/net/net.sh
index e6bb199c81..021b4cccee 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -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
diff --git a/net/remote/remote-sanity.sh b/net/remote/remote-sanity.sh
index cb41d056f2..4dbcc45e10 100755
--- a/net/remote/remote-sanity.sh
+++ b/net/remote/remote-sanity.sh
@@ -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"