Revert "Wait until the node successfully boots"

This reverts commit e84f1f6de7.
This commit is contained in:
Michael Vines
2019-01-23 11:25:35 -08:00
parent a0bc8b8af3
commit bae7612f36

View File

@ -148,7 +148,7 @@ local|tar)
maybeNoLeaderRotation="--no-leader-rotation" maybeNoLeaderRotation="--no-leader-rotation"
fi fi
rm -f init-complete-file
case $nodeType in case $nodeType in
bootstrap-leader) bootstrap-leader)
if [[ -e /dev/nvidia0 && -x ~/.cargo/bin/solana-fullnode-cuda ]]; then if [[ -e /dev/nvidia0 && -x ~/.cargo/bin/solana-fullnode-cuda ]]; then
@ -160,9 +160,7 @@ local|tar)
./multinode-demo/setup.sh -t bootstrap-leader $setupArgs ./multinode-demo/setup.sh -t bootstrap-leader $setupArgs
fi fi
./multinode-demo/drone.sh > drone.log 2>&1 & ./multinode-demo/drone.sh > drone.log 2>&1 &
./multinode-demo/bootstrap-leader.sh \ ./multinode-demo/bootstrap-leader.sh $maybeNoLeaderRotation > bootstrap-leader.log 2>&1 &
--init-complete-file init-complete-file
$maybeNoLeaderRotation > bootstrap-leader.log 2>&1 &
ln -sTf bootstrap-leader.log fullnode.log ln -sTf bootstrap-leader.log fullnode.log
;; ;;
fullnode) fullnode)
@ -177,28 +175,13 @@ local|tar)
if [[ $skipSetup != true ]]; then if [[ $skipSetup != true ]]; then
./multinode-demo/setup.sh -t fullnode $setupArgs ./multinode-demo/setup.sh -t fullnode $setupArgs
fi fi
./multinode-demo/fullnode.sh \ ./multinode-demo/fullnode.sh $maybeNoLeaderRotation "$entrypointIp":~/solana "$entrypointIp:8001" > fullnode.log 2>&1 &
--init-complete-file init-complete-file \
$maybeNoLeaderRotation \
"$entrypointIp":~/solana "$entrypointIp:8001" > fullnode.log 2>&1 &
;; ;;
*) *)
echo "Error: unknown node type: $nodeType" echo "Error: unknown node type: $nodeType"
exit 1 exit 1
;; ;;
esac esac
SECONDS=0
while [[ ! -r init-complete-file ]]; do
if [[ $SECONDS -ge 30 ]]; then
echo "Error: node failed to boot in $SECONDS seconds"
exit 1
fi
echo "Waiting for node to boot ($SECONDS)..."
sleep 2
done
echo "Node booted in $SECONDS seconds"
disown disown
;; ;;
*) *)