From bf1ecc24414f6cb316faeafcf9936074b07e1a1a Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Wed, 11 Sep 2019 10:53:10 -0700 Subject: [PATCH] Remove ledger verification, it's racy and essentially globaly disabled already (#5867) --- ci/testnet-deploy.sh | 3 --- ci/testnet-manager.sh | 14 -------------- ci/testnet-sanity.sh | 1 - net/net.sh | 5 ++--- net/remote/remote-sanity.sh | 30 ------------------------------ 5 files changed, 2 insertions(+), 51 deletions(-) diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh index 7213da8b6..8d1f59513 100755 --- a/ci/testnet-deploy.sh +++ b/ci/testnet-deploy.sh @@ -376,9 +376,6 @@ if ! $skipStart; then if [[ -n $NO_VALIDATOR_SANITY ]]; then args+=(-o noValidatorSanity) fi - if [[ -n $NO_LEDGER_VERIFY ]]; then - args+=(-o noLedgerVerify) - fi if [[ -n $NO_INSTALL_CHECK ]]; then args+=(-o noInstallCheck) fi diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh index 02ab4f32c..27e6379d9 100755 --- a/ci/testnet-manager.sh +++ b/ci/testnet-manager.sh @@ -217,7 +217,6 @@ sanity() { ( set -x NO_INSTALL_CHECK=1 \ - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ ci/testnet-sanity.sh edge-testnet-solana-com gce us-west1-b ) @@ -226,7 +225,6 @@ sanity() { ( set -x REJECT_EXTRA_NODES=1 \ - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ ci/testnet-sanity.sh edge-perf-testnet-solana-com ec2 us-west-2b ) @@ -235,7 +233,6 @@ sanity() { ( set -x NO_INSTALL_CHECK=1 \ - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ ci/testnet-sanity.sh beta-testnet-solana-com gce us-west1-b ) @@ -244,7 +241,6 @@ sanity() { ( set -x REJECT_EXTRA_NODES=1 \ - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ ci/testnet-sanity.sh beta-perf-testnet-solana-com ec2 us-west-2b ) @@ -252,7 +248,6 @@ sanity() { testnet) ( set -x - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ ci/testnet-sanity.sh testnet-solana-com gce us-west1-b ) @@ -261,7 +256,6 @@ sanity() { ( set -x REJECT_EXTRA_NODES=1 \ - NO_LEDGER_VERIFY=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 @@ -273,7 +267,6 @@ sanity() { ok=true if [[ -n $GCE_NODE_COUNT ]]; then - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ ci/testnet-sanity.sh demo-testnet-solana-com gce "${GCE_ZONES[0]}" -f || ok=false else @@ -286,7 +279,6 @@ sanity() { tds) ( set -x - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ ci/testnet-sanity.sh tds-solana-com gce "${GCE_ZONES[0]}" -f ) @@ -336,7 +328,6 @@ deploy() { testnet-edge-perf) ( set -x - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ RUST_LOG=solana=warn \ ci/testnet-deploy.sh -p edge-perf-testnet-solana-com -C ec2 -z us-west-2b \ @@ -363,7 +354,6 @@ deploy() { testnet-beta-perf) ( set -x - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ RUST_LOG=solana=warn \ ci/testnet-deploy.sh -p beta-perf-testnet-solana-com -C ec2 -z us-west-2b \ @@ -390,7 +380,6 @@ deploy() { testnet-perf) ( set -x - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ RUST_LOG=solana=warn \ ci/testnet-deploy.sh -p perf-testnet-solana-com -C gce -z us-west1-b \ @@ -412,7 +401,6 @@ deploy() { fi # shellcheck disable=SC2068 - NO_LEDGER_VERIFY=1 \ 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 -f \ @@ -426,7 +414,6 @@ deploy() { if [[ -n $GCE_LOW_QUOTA_NODE_COUNT ]]; then # shellcheck disable=SC2068 - NO_LEDGER_VERIFY=1 \ 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 -f -x \ @@ -532,7 +519,6 @@ deploy() { # Multiple V100 GPUs are available in us-west1, us-central1 and europe-west4 # shellcheck disable=SC2068 # shellcheck disable=SC2086 - NO_LEDGER_VERIFY=1 \ NO_VALIDATOR_SANITY=1 \ ci/testnet-deploy.sh -p tds-solana-com -C gce \ "${maybeGpu[@]}" \ diff --git a/ci/testnet-sanity.sh b/ci/testnet-sanity.sh index c768c0f5c..d6ac1647d 100755 --- a/ci/testnet-sanity.sh +++ b/ci/testnet-sanity.sh @@ -61,7 +61,6 @@ for zone in "$@"; do echo "--- net.sh sanity [$cloudProvider:$zone]" ok=true timeout 5m net/net.sh sanity \ - ${NO_LEDGER_VERIFY:+-o noLedgerVerify} \ ${NO_VALIDATOR_SANITY:+-o noValidatorSanity} \ ${REJECT_EXTRA_NODES:+-o rejectExtraNodes} \ ${NO_INSTALL_CHECK:+-o noInstallCheck} \ diff --git a/net/net.sh b/net/net.sh index 383ede554..9864e3933 100755 --- a/net/net.sh +++ b/net/net.sh @@ -83,7 +83,6 @@ Operate a configured testnet sanity/start/update-specific options: -F - Discard validator nodes that didn't bootup successfully - -o noLedgerVerify - Skip ledger verification -o noValidatorSanity - Skip fullnode sanity -o noInstallCheck - Skip solana-install sanity -o rejectExtraNodes - Require the exact number of nodes @@ -221,7 +220,7 @@ while getopts "h?T:t:o:f:rD:c:Fn:i:d" opt "${shortArgs[@]}"; do ;; o) case $OPTARG in - noLedgerVerify|noValidatorSanity|rejectExtraNodes|noInstallCheck) + noValidatorSanity|rejectExtraNodes|noInstallCheck) sanityExtraArgs="$sanityExtraArgs -o $OPTARG" ;; *) @@ -535,7 +534,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 noLedgerVerify -o noValidatorSanity \"$RUST_LOG\"" + "./solana/net/remote/remote-sanity.sh $blockstreamer $sanityExtraArgs -o noValidatorSanity \"$RUST_LOG\"" ) || ok=false $ok || exit 1 fi diff --git a/net/remote/remote-sanity.sh b/net/remote/remote-sanity.sh index 4a033dc2f..c916d1b38 100755 --- a/net/remote/remote-sanity.sh +++ b/net/remote/remote-sanity.sh @@ -33,7 +33,6 @@ missing() { [[ -n $numNodes ]] || missing numNodes [[ -n $failOnValidatorBootupFailure ]] || missing failOnValidatorBootupFailure -ledgerVerify=true validatorSanity=true installCheck=true rejectExtraNodes=false @@ -41,9 +40,6 @@ while [[ $1 = -o ]]; do opt="$2" shift 2 case $opt in - noLedgerVerify) - ledgerVerify=false - ;; noValidatorSanity) validatorSanity=false ;; @@ -78,11 +74,6 @@ local|tar|skip) solana_gossip=solana-gossip solana_install=solana-install - solana_keygen=solana-keygen - solana_ledger_tool=solana-ledger-tool - - ledger=config/bootstrap-leader - client_id=config/client-id.json ;; *) echo "Unknown deployment method: $deployMethod" @@ -102,7 +93,6 @@ fi echo "+++ $sanityTargetIp: node count ($numSanityNodes expected)" ( set -x - $solana_keygen new -f -o "$client_id" nodeArg="num-nodes" if $rejectExtraNodes; then @@ -133,26 +123,6 @@ else echo "Note: wallet sanity is disabled as airdrops are disabled" fi -echo "--- $sanityTargetIp: verify ledger" -if $ledgerVerify; then - if [[ -d $ledger ]]; then - ( - set -x - rm -rf /var/tmp/ledger-verify - du -hs "$ledger" - time cp -r "$ledger" /var/tmp/ledger-verify - time $solana_ledger_tool --ledger /var/tmp/ledger-verify verify - ) - else - echo "^^^ +++" - echo "Ledger verify skipped: directory does not exist: $ledger" - fi -else - echo "^^^ +++" - echo "Note: ledger verify disabled" -fi - - echo "--- $sanityTargetIp: validator sanity" if $validatorSanity; then (