Remove unused exchange program and bench client (#18463)

This commit is contained in:
Justin Starry
2021-07-12 21:59:11 -05:00
committed by GitHub
parent 8ad4ffdee5
commit cfece66403
24 changed files with 11 additions and 3544 deletions

View File

@ -20,7 +20,6 @@ usage() {
Valid client types are:
idle
bench-tps
bench-exchange
User can optionally provide extraArgs that are transparently
supplied to the client program as command line parameters.
For example,
@ -307,7 +306,6 @@ startBootstrapLeader() {
\"$internalNodesLamports\" \
$nodeIndex \
${#clientIpList[@]} \"$benchTpsExtraArgs\" \
${#clientIpList[@]} \"$benchExchangeExtraArgs\" \
\"$genesisOptions\" \
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \
\"$gpuMode\" \
@ -379,7 +377,6 @@ startNode() {
\"$internalNodesLamports\" \
$nodeIndex \
${#clientIpList[@]} \"$benchTpsExtraArgs\" \
${#clientIpList[@]} \"$benchExchangeExtraArgs\" \
\"$genesisOptions\" \
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \
\"$gpuMode\" \
@ -409,7 +406,7 @@ startClient() {
startCommon "$ipAddress"
ssh "${sshOptions[@]}" -f "$ipAddress" \
"./solana/net/remote/remote-client.sh $deployMethod $entrypointIp \
$clientToRun \"$RUST_LOG\" \"$benchTpsExtraArgs\" \"$benchExchangeExtraArgs\" $clientIndex"
$clientToRun \"$RUST_LOG\" \"$benchTpsExtraArgs\" $clientIndex"
) >> "$logFile" 2>&1 || {
cat "$logFile"
echo "^^^ +++"
@ -421,8 +418,6 @@ startClients() {
for ((i=0; i < "$numClients" && i < "$numClientsRequested"; i++)) do
if [[ $i -lt "$numBenchTpsClients" ]]; then
startClient "${clientIpList[$i]}" "solana-bench-tps" "$i"
elif [[ $i -lt $((numBenchTpsClients + numBenchExchangeClients)) ]]; then
startClient "${clientIpList[$i]}" "solana-bench-exchange" $((i-numBenchTpsClients))
else
startClient "${clientIpList[$i]}" "idle"
fi
@ -767,9 +762,7 @@ updatePlatforms=
nodeAddress=
numIdleClients=0
numBenchTpsClients=0
numBenchExchangeClients=0
benchTpsExtraArgs=
benchExchangeExtraArgs=
failOnValidatorBootupFailure=true
genesisOptions=
numValidatorsRequested=
@ -977,10 +970,6 @@ while getopts "h?T:t:o:f:rc:Fn:i:d" opt "${shortArgs[@]}"; do
numBenchTpsClients=$numClients
benchTpsExtraArgs=$extraArgs
;;
bench-exchange)
numBenchExchangeClients=$numClients
benchExchangeExtraArgs=$extraArgs
;;
*)
echo "Unknown client type: $clientType"
exit 1
@ -1013,7 +1002,7 @@ if [[ -n $numValidatorsRequested ]]; then
fi
numClients=${#clientIpList[@]}
numClientsRequested=$((numBenchTpsClients + numBenchExchangeClients + numIdleClients))
numClientsRequested=$((numBenchTpsClients + numIdleClients))
if [[ "$numClientsRequested" -eq 0 ]]; then
numBenchTpsClients=$numClients
numClientsRequested=$numClients