Include blockstreamer node in sanity

This commit is contained in:
Michael Vines 2019-04-09 16:20:44 -07:00
parent 62c28a8592
commit 0b95a5c121
1 changed files with 15 additions and 4 deletions

View File

@ -198,7 +198,7 @@ startBootstrapLeader() {
bootstrap-leader \ bootstrap-leader \
$publicNetwork \ $publicNetwork \
$entrypointIp \ $entrypointIp \
${#fullnodeIpList[@]} \ $((${#fullnodeIpList[@]} + ${#blockstreamerIpList[@]})) \
\"$RUST_LOG\" \ \"$RUST_LOG\" \
$skipSetup \ $skipSetup \
$leaderRotation \ $leaderRotation \
@ -226,7 +226,7 @@ startNode() {
$nodeType \ $nodeType \
$publicNetwork \ $publicNetwork \
$entrypointIp \ $entrypointIp \
${#fullnodeIpList[@]} \ $((${#fullnodeIpList[@]} + ${#blockstreamerIpList[@]})) \
\"$RUST_LOG\" \ \"$RUST_LOG\" \
$skipSetup \ $skipSetup \
$leaderRotation \ $leaderRotation \
@ -260,12 +260,23 @@ sanity() {
echo "--- Sanity" echo "--- Sanity"
$metricsWriteDatapoint "testnet-deploy net-sanity-begin=1" $metricsWriteDatapoint "testnet-deploy net-sanity-begin=1"
declare host=${fullnodeIpList[0]} declare bootstrapLeader=${fullnodeIpList[0]}
declare blockstreamer=${blockstreamerIpList[0]}
( (
set -x set -x
echo "--- Sanity: $bootstrapLeader"
# shellcheck disable=SC2029 # remote-client.sh args are expanded on client side intentionally # shellcheck disable=SC2029 # remote-client.sh args are expanded on client side intentionally
ssh "${sshOptions[@]}" "$host" \ ssh "${sshOptions[@]}" "$bootstrapLeader" \
"./solana/net/remote/remote-sanity.sh $sanityExtraArgs \"$RUST_LOG\"" "./solana/net/remote/remote-sanity.sh $sanityExtraArgs \"$RUST_LOG\""
# If there's a blockstreamer node run a reduced sanity check on it as well
if [[ -n $blockstreamer ]]; then
echo "--- Sanity: $blockstreamer"
# shellcheck disable=SC2029 # remote-client.sh args are expanded on client side intentionally
ssh "${sshOptions[@]}" "$blockstreamer" \
"./solana/net/remote/remote-sanity.sh $sanityExtraArgs -o noLedgerVerify -o noValidatorSanity \"$RUST_LOG\""
fi
) || ok=false ) || ok=false
$metricsWriteDatapoint "testnet-deploy net-sanity-complete=1" $metricsWriteDatapoint "testnet-deploy net-sanity-complete=1"