parent
9cf9de6044
commit
6f58bdfcb1
|
@ -371,9 +371,6 @@ if ! $skipStart; then
|
||||||
if ! $publicNetwork; then
|
if ! $publicNetwork; then
|
||||||
args+=(-o rejectExtraNodes)
|
args+=(-o rejectExtraNodes)
|
||||||
fi
|
fi
|
||||||
if [[ -n $NO_VALIDATOR_SANITY ]]; then
|
|
||||||
args+=(-o noValidatorSanity)
|
|
||||||
fi
|
|
||||||
if [[ -n $NO_INSTALL_CHECK ]]; then
|
if [[ -n $NO_INSTALL_CHECK ]]; then
|
||||||
args+=(-o noInstallCheck)
|
args+=(-o noInstallCheck)
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -231,7 +231,6 @@ sanity() {
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
NO_INSTALL_CHECK=1 \
|
NO_INSTALL_CHECK=1 \
|
||||||
NO_VALIDATOR_SANITY=1 \
|
|
||||||
ci/testnet-sanity.sh edge-testnet-solana-com gce -P us-west1-b
|
ci/testnet-sanity.sh edge-testnet-solana-com gce -P us-west1-b
|
||||||
maybe_deploy_software
|
maybe_deploy_software
|
||||||
)
|
)
|
||||||
|
@ -240,7 +239,6 @@ sanity() {
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
REJECT_EXTRA_NODES=1 \
|
REJECT_EXTRA_NODES=1 \
|
||||||
NO_VALIDATOR_SANITY=1 \
|
|
||||||
ci/testnet-sanity.sh edge-perf-testnet-solana-com ec2 us-west-2b
|
ci/testnet-sanity.sh edge-perf-testnet-solana-com ec2 us-west-2b
|
||||||
)
|
)
|
||||||
;;
|
;;
|
||||||
|
@ -248,7 +246,6 @@ sanity() {
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
NO_INSTALL_CHECK=1 \
|
NO_INSTALL_CHECK=1 \
|
||||||
NO_VALIDATOR_SANITY=1 \
|
|
||||||
ci/testnet-sanity.sh beta-testnet-solana-com gce us-west1-b
|
ci/testnet-sanity.sh beta-testnet-solana-com gce us-west1-b
|
||||||
maybe_deploy_software --deploy-if-newer
|
maybe_deploy_software --deploy-if-newer
|
||||||
)
|
)
|
||||||
|
@ -257,22 +254,19 @@ sanity() {
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
REJECT_EXTRA_NODES=1 \
|
REJECT_EXTRA_NODES=1 \
|
||||||
NO_VALIDATOR_SANITY=1 \
|
|
||||||
ci/testnet-sanity.sh beta-perf-testnet-solana-com ec2 us-west-2b
|
ci/testnet-sanity.sh beta-perf-testnet-solana-com ec2 us-west-2b
|
||||||
)
|
)
|
||||||
;;
|
;;
|
||||||
testnet)
|
testnet)
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
NO_VALIDATOR_SANITY=1 \
|
ci/testnet-sanity.sh testnet-solana-com gce us-west1-b
|
||||||
ci/testnet-sanity.sh testnet-solana-com gce us-west1-b
|
|
||||||
)
|
)
|
||||||
;;
|
;;
|
||||||
testnet-perf)
|
testnet-perf)
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
REJECT_EXTRA_NODES=1 \
|
REJECT_EXTRA_NODES=1 \
|
||||||
NO_VALIDATOR_SANITY=1 \
|
|
||||||
ci/testnet-sanity.sh perf-testnet-solana-com gce us-west1-b
|
ci/testnet-sanity.sh perf-testnet-solana-com gce us-west1-b
|
||||||
#ci/testnet-sanity.sh perf-testnet-solana-com ec2 us-east-1a
|
#ci/testnet-sanity.sh perf-testnet-solana-com ec2 us-east-1a
|
||||||
)
|
)
|
||||||
|
@ -283,8 +277,7 @@ sanity() {
|
||||||
|
|
||||||
ok=true
|
ok=true
|
||||||
if [[ -n $GCE_NODE_COUNT ]]; then
|
if [[ -n $GCE_NODE_COUNT ]]; then
|
||||||
NO_VALIDATOR_SANITY=1 \
|
ci/testnet-sanity.sh demo-testnet-solana-com gce "${GCE_ZONES[0]}" -f || ok=false
|
||||||
ci/testnet-sanity.sh demo-testnet-solana-com gce "${GCE_ZONES[0]}" -f || ok=false
|
|
||||||
else
|
else
|
||||||
echo "Error: no GCE nodes"
|
echo "Error: no GCE nodes"
|
||||||
ok=false
|
ok=false
|
||||||
|
@ -295,8 +288,7 @@ sanity() {
|
||||||
tds)
|
tds)
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
NO_VALIDATOR_SANITY=1 \
|
ci/testnet-sanity.sh tds-solana-com gce "${GCE_ZONES[0]}" -f
|
||||||
ci/testnet-sanity.sh tds-solana-com gce "${GCE_ZONES[0]}" -f
|
|
||||||
)
|
)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -345,7 +337,6 @@ deploy() {
|
||||||
testnet-edge-perf)
|
testnet-edge-perf)
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
NO_VALIDATOR_SANITY=1 \
|
|
||||||
RUST_LOG=solana=warn \
|
RUST_LOG=solana=warn \
|
||||||
ci/testnet-deploy.sh -p edge-perf-testnet-solana-com -C ec2 -z us-west-2b \
|
ci/testnet-deploy.sh -p edge-perf-testnet-solana-com -C ec2 -z us-west-2b \
|
||||||
-g -t "$CHANNEL_OR_TAG" -c 2 \
|
-g -t "$CHANNEL_OR_TAG" -c 2 \
|
||||||
|
@ -371,7 +362,6 @@ deploy() {
|
||||||
testnet-beta-perf)
|
testnet-beta-perf)
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
NO_VALIDATOR_SANITY=1 \
|
|
||||||
RUST_LOG=solana=warn \
|
RUST_LOG=solana=warn \
|
||||||
ci/testnet-deploy.sh -p beta-perf-testnet-solana-com -C ec2 -z us-west-2b \
|
ci/testnet-deploy.sh -p beta-perf-testnet-solana-com -C ec2 -z us-west-2b \
|
||||||
-g -t "$CHANNEL_OR_TAG" -c 2 \
|
-g -t "$CHANNEL_OR_TAG" -c 2 \
|
||||||
|
@ -402,7 +392,6 @@ deploy() {
|
||||||
testnet-perf)
|
testnet-perf)
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
NO_VALIDATOR_SANITY=1 \
|
|
||||||
RUST_LOG=solana=warn \
|
RUST_LOG=solana=warn \
|
||||||
ci/testnet-deploy.sh -p perf-testnet-solana-com -C gce -z us-west1-b \
|
ci/testnet-deploy.sh -p perf-testnet-solana-com -C gce -z us-west1-b \
|
||||||
-G "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100" \
|
-G "--machine-type n1-standard-16 --accelerator count=2,type=nvidia-tesla-v100" \
|
||||||
|
@ -423,26 +412,24 @@ deploy() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# shellcheck disable=SC2068
|
# shellcheck disable=SC2068
|
||||||
NO_VALIDATOR_SANITY=1 \
|
ci/testnet-deploy.sh -p demo-testnet-solana-com -C gce ${GCE_ZONE_ARGS[@]} \
|
||||||
ci/testnet-deploy.sh -p demo-testnet-solana-com -C gce ${GCE_ZONE_ARGS[@]} \
|
-t "$CHANNEL_OR_TAG" -n "$GCE_NODE_COUNT" -c 0 -P -u --allow-boot-failures \
|
||||||
-t "$CHANNEL_OR_TAG" -n "$GCE_NODE_COUNT" -c 0 -P -u --allow-boot-failures \
|
--skip-remote-log-retrieval \
|
||||||
--skip-remote-log-retrieval \
|
-a demo-testnet-solana-com \
|
||||||
-a demo-testnet-solana-com \
|
${skipCreate:+-e} \
|
||||||
${skipCreate:+-e} \
|
${maybeSkipStart:+-s} \
|
||||||
${maybeSkipStart:+-s} \
|
${maybeStop:+-S} \
|
||||||
${maybeStop:+-S} \
|
${maybeDelete:+-D}
|
||||||
${maybeDelete:+-D}
|
|
||||||
|
|
||||||
if [[ -n $GCE_LOW_QUOTA_NODE_COUNT ]]; then
|
if [[ -n $GCE_LOW_QUOTA_NODE_COUNT ]]; then
|
||||||
# shellcheck disable=SC2068
|
# shellcheck disable=SC2068
|
||||||
NO_VALIDATOR_SANITY=1 \
|
ci/testnet-deploy.sh -p demo-testnet-solana-com2 -C gce ${GCE_LOW_QUOTA_ZONE_ARGS[@]} \
|
||||||
ci/testnet-deploy.sh -p demo-testnet-solana-com2 -C gce ${GCE_LOW_QUOTA_ZONE_ARGS[@]} \
|
-t "$CHANNEL_OR_TAG" -n "$GCE_LOW_QUOTA_NODE_COUNT" -c 0 -P --allow-boot-failures -x \
|
||||||
-t "$CHANNEL_OR_TAG" -n "$GCE_LOW_QUOTA_NODE_COUNT" -c 0 -P --allow-boot-failures -x \
|
--skip-remote-log-retrieval \
|
||||||
--skip-remote-log-retrieval \
|
${skipCreate:+-e} \
|
||||||
${skipCreate:+-e} \
|
${skipStart:+-s} \
|
||||||
${skipStart:+-s} \
|
${maybeStop:+-S} \
|
||||||
${maybeStop:+-S} \
|
${maybeDelete:+-D}
|
||||||
${maybeDelete:+-D}
|
|
||||||
fi
|
fi
|
||||||
)
|
)
|
||||||
;;
|
;;
|
||||||
|
@ -539,27 +526,26 @@ deploy() {
|
||||||
# Multiple V100 GPUs are available in us-west1, us-central1 and europe-west4
|
# Multiple V100 GPUs are available in us-west1, us-central1 and europe-west4
|
||||||
# shellcheck disable=SC2068
|
# shellcheck disable=SC2068
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
NO_VALIDATOR_SANITY=1 \
|
ci/testnet-deploy.sh -p tds-solana-com -C gce \
|
||||||
ci/testnet-deploy.sh -p tds-solana-com -C gce \
|
"${maybeGpu[@]}" \
|
||||||
"${maybeGpu[@]}" \
|
-d pd-ssd \
|
||||||
-d pd-ssd \
|
${GCE_CLOUD_ZONES[@]/#/-z } \
|
||||||
${GCE_CLOUD_ZONES[@]/#/-z } \
|
-t "$CHANNEL_OR_TAG" \
|
||||||
-t "$CHANNEL_OR_TAG" \
|
-n ${TDS_NODE_COUNT} \
|
||||||
-n ${TDS_NODE_COUNT} \
|
-c ${TDS_CLIENT_COUNT} \
|
||||||
-c ${TDS_CLIENT_COUNT} \
|
-P -u \
|
||||||
-P -u \
|
-a tds-solana-com --letsencrypt tds.solana.com \
|
||||||
-a tds-solana-com --letsencrypt tds.solana.com \
|
${maybeHashesPerTick} \
|
||||||
${maybeHashesPerTick} \
|
${skipCreate:+-e} \
|
||||||
${skipCreate:+-e} \
|
${skipStart:+-s} \
|
||||||
${skipStart:+-s} \
|
${maybeStop:+-S} \
|
||||||
${maybeStop:+-S} \
|
${maybeDelete:+-D} \
|
||||||
${maybeDelete:+-D} \
|
${maybeDisableAirdrops} \
|
||||||
${maybeDisableAirdrops} \
|
${maybeInternalNodesStakeLamports} \
|
||||||
${maybeInternalNodesStakeLamports} \
|
${maybeInternalNodesLamports} \
|
||||||
${maybeInternalNodesLamports} \
|
${maybeExternalAccountsFile} \
|
||||||
${maybeExternalAccountsFile} \
|
${maybeLamports} \
|
||||||
${maybeLamports} \
|
${maybeAdditionalDisk}
|
||||||
${maybeAdditionalDisk}
|
|
||||||
)
|
)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
|
@ -67,7 +67,6 @@ for zone in "$@"; do
|
||||||
echo "--- net.sh sanity [$cloudProvider:$zone]"
|
echo "--- net.sh sanity [$cloudProvider:$zone]"
|
||||||
ok=true
|
ok=true
|
||||||
timeout 5m net/net.sh sanity \
|
timeout 5m net/net.sh sanity \
|
||||||
${NO_VALIDATOR_SANITY:+-o noValidatorSanity} \
|
|
||||||
${REJECT_EXTRA_NODES:+-o rejectExtraNodes} \
|
${REJECT_EXTRA_NODES:+-o rejectExtraNodes} \
|
||||||
${NO_INSTALL_CHECK:+-o noInstallCheck} \
|
${NO_INSTALL_CHECK:+-o noInstallCheck} \
|
||||||
$zone || ok=false
|
$zone || ok=false
|
||||||
|
|
|
@ -87,7 +87,6 @@ Operate a configured testnet
|
||||||
|
|
||||||
sanity/start-specific options:
|
sanity/start-specific options:
|
||||||
-F - Discard validator nodes that didn't bootup successfully
|
-F - Discard validator nodes that didn't bootup successfully
|
||||||
-o noValidatorSanity - Skip fullnode sanity
|
|
||||||
-o noInstallCheck - Skip solana-install sanity
|
-o noInstallCheck - Skip solana-install sanity
|
||||||
-o rejectExtraNodes - Require the exact number of nodes
|
-o rejectExtraNodes - Require the exact number of nodes
|
||||||
|
|
||||||
|
@ -246,7 +245,7 @@ while getopts "h?T:t:o:f:rD:c:Fn:i:d" opt "${shortArgs[@]}"; do
|
||||||
;;
|
;;
|
||||||
o)
|
o)
|
||||||
case $OPTARG in
|
case $OPTARG in
|
||||||
noValidatorSanity|rejectExtraNodes|noInstallCheck)
|
rejectExtraNodes|noInstallCheck)
|
||||||
sanityExtraArgs="$sanityExtraArgs -o $OPTARG"
|
sanityExtraArgs="$sanityExtraArgs -o $OPTARG"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -562,7 +561,7 @@ sanity() {
|
||||||
set -x
|
set -x
|
||||||
# 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[@]}" "$blockstreamer" \
|
ssh "${sshOptions[@]}" "$blockstreamer" \
|
||||||
"./solana/net/remote/remote-sanity.sh $blockstreamer $sanityExtraArgs -o noValidatorSanity \"$RUST_LOG\""
|
"./solana/net/remote/remote-sanity.sh $blockstreamer $sanityExtraArgs \"$RUST_LOG\""
|
||||||
) || ok=false
|
) || ok=false
|
||||||
$ok || exit 1
|
$ok || exit 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -33,16 +33,12 @@ missing() {
|
||||||
[[ -n $numNodes ]] || missing numNodes
|
[[ -n $numNodes ]] || missing numNodes
|
||||||
[[ -n $failOnValidatorBootupFailure ]] || missing failOnValidatorBootupFailure
|
[[ -n $failOnValidatorBootupFailure ]] || missing failOnValidatorBootupFailure
|
||||||
|
|
||||||
validatorSanity=true
|
|
||||||
installCheck=true
|
installCheck=true
|
||||||
rejectExtraNodes=false
|
rejectExtraNodes=false
|
||||||
while [[ $1 = -o ]]; do
|
while [[ $1 = -o ]]; do
|
||||||
opt="$2"
|
opt="$2"
|
||||||
shift 2
|
shift 2
|
||||||
case $opt in
|
case $opt in
|
||||||
noValidatorSanity)
|
|
||||||
validatorSanity=false
|
|
||||||
;;
|
|
||||||
noInstallCheck)
|
noInstallCheck)
|
||||||
installCheck=false
|
installCheck=false
|
||||||
;;
|
;;
|
||||||
|
@ -129,29 +125,6 @@ else
|
||||||
echo "Note: wallet sanity is disabled as airdrops are disabled"
|
echo "Note: wallet sanity is disabled as airdrops are disabled"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "--- $sanityTargetIp: validator sanity"
|
|
||||||
if $validatorSanity; then
|
|
||||||
(
|
|
||||||
set -x -o pipefail
|
|
||||||
timeout 10s ./multinode-demo/validator-x.sh \
|
|
||||||
--no-restart --entrypoint "$sanityTargetIp:8001" 2>&1 | tee validator-sanity.log
|
|
||||||
) || {
|
|
||||||
exitcode=$?
|
|
||||||
[[ $exitcode -eq 124 ]] || exit $exitcode
|
|
||||||
}
|
|
||||||
wc -l validator-sanity.log
|
|
||||||
if grep -C100 panic validator-sanity.log; then
|
|
||||||
echo "^^^ +++"
|
|
||||||
echo "Panic observed"
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
echo "Validator sanity log looks ok"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "^^^ +++"
|
|
||||||
echo "Note: validator sanity disabled"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if $installCheck && [[ -r update_manifest_keypair.json ]]; then
|
if $installCheck && [[ -r update_manifest_keypair.json ]]; then
|
||||||
echo "--- $sanityTargetIp: solana-install test"
|
echo "--- $sanityTargetIp: solana-install test"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue