Bump baseline version to 0.23.4, improve error reporting

This commit is contained in:
Michael Vines 2020-02-12 09:59:44 -07:00
parent 1e0f2b2446
commit 2542d5dd42
2 changed files with 17 additions and 6 deletions

View File

@ -1,2 +1,3 @@
/baseline-run.sh /baseline-run.sh
/config/ /config/
/releases/

View File

@ -9,15 +9,16 @@ cd "$(dirname "$0")"
logDir="$PWD"/logs logDir="$PWD"/logs
ledgerDir="$PWD"/config ledgerDir="$PWD"/config
rm -rf "$ledgerDir" "$logDir"
mkdir -p "$logDir" mkdir -p "$logDir"
baselineVersion=0.23.2 # <-- oldest version we remain compatible with baselineVersion=0.23.4 # <-- oldest version we remain compatible with
otherVersions=( otherVersions=(
beta beta
edge edge
) )
solanaInstallDataDir=$PWD/config/solana solanaInstallDataDir=$PWD/releases
solanaInstallGlobalOpts=( solanaInstallGlobalOpts=(
--data-dir "$solanaInstallDataDir" --data-dir "$solanaInstallDataDir"
--config "$solanaInstallDataDir"/config.yml --config "$solanaInstallDataDir"/config.yml
@ -31,7 +32,7 @@ bootstrapInstall() {
curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v"$v"/install/solana-install-init.sh \ curl -sSf https://raw.githubusercontent.com/solana-labs/solana/v"$v"/install/solana-install-init.sh \
| sh -s - "$v" "${solanaInstallGlobalOpts[@]}" | sh -s - "$v" "${solanaInstallGlobalOpts[@]}"
fi fi
export PATH="$PWD/solana/active_release/bin/:$PATH" export PATH="$solanaInstallDataDir/active_release/bin/:$PATH"
} }
bootstrapInstall "$baselineVersion" bootstrapInstall "$baselineVersion"
@ -70,8 +71,14 @@ killSession
./baseline-run.sh 2>&1 | tee $logDir/$baselineVersion.log \ ./baseline-run.sh 2>&1 | tee $logDir/$baselineVersion.log \
" "
# Give it time to boot SECONDS=
sleep 5 while [[ ! -f config/baseline-run/init-completed ]]; do
sleep 5
if [[ $SECONDS -gt 60 ]]; then
echo "Error: validator failed to start"
exit 1
fi
done
solana --url http://127.0.0.1:8899 show-validators solana --url http://127.0.0.1:8899 show-validators
) )
@ -122,7 +129,10 @@ for v in "${otherVersions[@]}"; do
SECONDS= SECONDS=
while [[ ! -f $ledger/snapshot.tar.bz2 ]]; do while [[ ! -f $ledger/snapshot.tar.bz2 ]]; do
sleep 5 sleep 5
test $SECONDS -lt 60 if [[ $SECONDS -gt 60 ]]; then
echo "Error: validator failed to create a snapshot"
exit 1
fi
done done
) )
echo Ok echo Ok