gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove node check from client start-up

Browse Source 
If the network loses a validator or two, it's the job of the sanity
check to detect this not the bench clients
This commit is contained in:
Michael Vines
2018-11-06 13:55:01 -08:00
parent dc3b270410
commit b250d20059
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/net.sh
View File

@ -198,7 +198,7 @@ startClient() {
set -x set -x
startCommon "$ipAddress" startCommon "$ipAddress"
ssh "${sshOptions[@]}" -f "$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 || { ) >> "$logFile" 2>&1 || {
cat "$logFile" cat "$logFile"
echo "^^^ +++" echo "^^^ +++"

5
net/remote/remote-client.sh
View File

@ -6,8 +6,7 @@ echo "$(date) | $0 $*" > client.log
deployMethod="$1" deployMethod="$1"
entrypointIp="$2" entrypointIp="$2"
numNodes="$3" RUST_LOG="$3"
RUST_LOG="$4"
export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
missing() { missing() {
@ -17,7 +16,6 @@ missing() {
[[ -n $deployMethod ]] || missing deployMethod [[ -n $deployMethod ]] || missing deployMethod
[[ -n $entrypointIp ]] || missing entrypointIp [[ -n $entrypointIp ]] || missing entrypointIp
[[ -n $numNodes ]] || missing numNodes
source net/common.sh source net/common.sh
loadConfigFile loadConfigFile
@ -58,7 +56,6 @@ clientCommand="\
$solana_bench_tps \ $solana_bench_tps \
--network $entrypointIp:8001 \ --network $entrypointIp:8001 \
--identity client.json \ --identity client.json \
--num-nodes $numNodes \
--duration 7500 \ --duration 7500 \
--sustained \ --sustained \
--threads $threadCount \ --threads $threadCount \