Drop code supporting no leader rotation (#5286)
This commit is contained in:
parent
d6c74f438a
commit
5f09aa36b3
|
@ -5,7 +5,6 @@ skipSetup=false
|
||||||
iterations=1
|
iterations=1
|
||||||
restartInterval=never
|
restartInterval=never
|
||||||
rollingRestart=false
|
rollingRestart=false
|
||||||
maybeNoLeaderRotation=
|
|
||||||
extraNodes=0
|
extraNodes=0
|
||||||
walletRpcPort=:8899
|
walletRpcPort=:8899
|
||||||
|
|
||||||
|
@ -54,9 +53,6 @@ while getopts "ch?i:k:brxR" opt; do
|
||||||
k)
|
k)
|
||||||
restartInterval=$OPTARG
|
restartInterval=$OPTARG
|
||||||
;;
|
;;
|
||||||
b)
|
|
||||||
maybeNoLeaderRotation="--stake 0"
|
|
||||||
;;
|
|
||||||
x)
|
x)
|
||||||
extraNodes=$((extraNodes + 1))
|
extraNodes=$((extraNodes + 1))
|
||||||
;;
|
;;
|
||||||
|
@ -82,7 +78,6 @@ nodes=(
|
||||||
--no-restart \
|
--no-restart \
|
||||||
--init-complete-file init-complete-node1.log"
|
--init-complete-file init-complete-node1.log"
|
||||||
"multinode-demo/validator.sh \
|
"multinode-demo/validator.sh \
|
||||||
$maybeNoLeaderRotation \
|
|
||||||
--enable-rpc-exit \
|
--enable-rpc-exit \
|
||||||
--no-restart \
|
--no-restart \
|
||||||
--init-complete-file init-complete-node2.log \
|
--init-complete-file init-complete-node2.log \
|
||||||
|
@ -94,8 +89,7 @@ for i in $(seq 1 $extraNodes); do
|
||||||
"multinode-demo/validator.sh \
|
"multinode-demo/validator.sh \
|
||||||
--no-restart \
|
--no-restart \
|
||||||
--label dyn$i \
|
--label dyn$i \
|
||||||
--init-complete-file init-complete-node$((2 + i)).log \
|
--init-complete-file init-complete-node$((2 + i)).log"
|
||||||
$maybeNoLeaderRotation"
|
|
||||||
)
|
)
|
||||||
done
|
done
|
||||||
numNodes=$((2 + extraNodes))
|
numNodes=$((2 + extraNodes))
|
||||||
|
@ -312,7 +306,6 @@ else
|
||||||
fi
|
fi
|
||||||
startNodes
|
startNodes
|
||||||
lastTransactionCount=
|
lastTransactionCount=
|
||||||
enforceTransactionCountAdvance=true
|
|
||||||
while [[ $iteration -le $iterations ]]; do
|
while [[ $iteration -le $iterations ]]; do
|
||||||
echo "--- Node count ($iteration)"
|
echo "--- Node count ($iteration)"
|
||||||
(
|
(
|
||||||
|
@ -348,36 +341,20 @@ while [[ $iteration -le $iterations ]]; do
|
||||||
transactionCount=$(sed -e 's/{"jsonrpc":"2.0","result":\([0-9]*\),"id":1}/\1/' log-transactionCount.txt)
|
transactionCount=$(sed -e 's/{"jsonrpc":"2.0","result":\([0-9]*\),"id":1}/\1/' log-transactionCount.txt)
|
||||||
if [[ -n $lastTransactionCount ]]; then
|
if [[ -n $lastTransactionCount ]]; then
|
||||||
echo "--- Transaction count check: $lastTransactionCount < $transactionCount"
|
echo "--- Transaction count check: $lastTransactionCount < $transactionCount"
|
||||||
if $enforceTransactionCountAdvance; then
|
|
||||||
if [[ $lastTransactionCount -ge $transactionCount ]]; then
|
if [[ $lastTransactionCount -ge $transactionCount ]]; then
|
||||||
echo "Error: Transaction count is not advancing"
|
echo "Error: Transaction count is not advancing"
|
||||||
echo "* lastTransactionCount: $lastTransactionCount"
|
echo "* lastTransactionCount: $lastTransactionCount"
|
||||||
echo "* transactionCount: $transactionCount"
|
echo "* transactionCount: $transactionCount"
|
||||||
flag_error
|
flag_error
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
echo "enforceTransactionCountAdvance=false"
|
|
||||||
fi
|
|
||||||
enforceTransactionCountAdvance=true
|
|
||||||
fi
|
fi
|
||||||
lastTransactionCount=$transactionCount
|
lastTransactionCount=$transactionCount
|
||||||
|
|
||||||
echo "--- Wallet sanity ($iteration)"
|
echo "--- Wallet sanity ($iteration)"
|
||||||
flag_error_if_no_leader_rotation() {
|
|
||||||
# TODO: Stop ignoring wallet sanity failures when leader rotation is enabled
|
|
||||||
# once https://github.com/solana-labs/solana/issues/2474 is fixed
|
|
||||||
if [[ -n $maybeNoLeaderRotation ]]; then
|
|
||||||
flag_error
|
|
||||||
else
|
|
||||||
# Wallet error occurred (and was ignored) so transactionCount may not
|
|
||||||
# advance on the next iteration
|
|
||||||
enforceTransactionCountAdvance=false
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
timeout 60s scripts/wallet-sanity.sh --url http://127.0.0.1"$walletRpcPort"
|
timeout 60s scripts/wallet-sanity.sh --url http://127.0.0.1"$walletRpcPort"
|
||||||
) || flag_error_if_no_leader_rotation
|
) || flag_error
|
||||||
|
|
||||||
iteration=$((iteration + 1))
|
iteration=$((iteration + 1))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue