From b250d200594bae53b0f2d26b9f9ceb5a5ac72cbf Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Tue, 6 Nov 2018 13:55:01 -0800 Subject: [PATCH] Remove node check from client start-up If the network loses a validator or two, it's the job of the sanity check to detect this not the bench clients --- net/net.sh | 2 +- net/remote/remote-client.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/net/net.sh b/net/net.sh index 1af3319f7f..77744be29a 100755 --- a/net/net.sh +++ b/net/net.sh @@ -198,7 +198,7 @@ startClient() { set -x startCommon "$ipAddress" ssh "${sshOptions[@]}" -f "$ipAddress" \ - "./solana/net/remote/remote-client.sh $deployMethod $entrypointIp $expectedNodeCount \"$RUST_LOG\"" + "./solana/net/remote/remote-client.sh $deployMethod $entrypointIp \"$RUST_LOG\"" ) >> "$logFile" 2>&1 || { cat "$logFile" echo "^^^ +++" diff --git a/net/remote/remote-client.sh b/net/remote/remote-client.sh index 9827c8dd4a..d650eff692 100755 --- a/net/remote/remote-client.sh +++ b/net/remote/remote-client.sh @@ -6,8 +6,7 @@ echo "$(date) | $0 $*" > client.log deployMethod="$1" entrypointIp="$2" -numNodes="$3" -RUST_LOG="$4" +RUST_LOG="$3" export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info missing() { @@ -17,7 +16,6 @@ missing() { [[ -n $deployMethod ]] || missing deployMethod [[ -n $entrypointIp ]] || missing entrypointIp -[[ -n $numNodes ]] || missing numNodes source net/common.sh loadConfigFile @@ -58,7 +56,6 @@ clientCommand="\ $solana_bench_tps \ --network $entrypointIp:8001 \ --identity client.json \ - --num-nodes $numNodes \ --duration 7500 \ --sustained \ --threads $threadCount \