gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Colo: Don't fail without a message (#6558)

Browse Source
This commit is contained in:
Trent Nelson
2019-10-28 09:20:49 -06:00
committed by GitHub
parent 0c14ca58c7
commit 96e209db49
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/scripts/colo-node-onacquire-sh
View File

@ -10,12 +10,12 @@
if [ ! -f "$SOLANA_LOCK_FILE" ]; then if [ ! -f "$SOLANA_LOCK_FILE" ]; then
exec 9>>"$SOLANA_LOCK_FILE" exec 9>>"$SOLANA_LOCK_FILE"
flock -x -n 9 || exit 1 flock -x -n 9 || ( echo "Failed to acquire lock!" 1>&2 && exit 1 )
[ -n "\$SOLANA_USER" ] && { [ -n "\$SOLANA_USER" ] && {
echo "export SOLANA_LOCK_USER=\$SOLANA_USER" echo "export SOLANA_LOCK_USER=\$SOLANA_USER"
echo "export SOLANA_LOCK_INSTANCENAME=$INSTANCE_NAME" echo "export SOLANA_LOCK_INSTANCENAME=$INSTANCE_NAME"
echo "[ -v SSH_TTY -a -f \"\${HOME}/.solana-motd\" ] && cat \"\${HOME}/.solana-motd\" 1>&2" echo "[ -v SSH_TTY -a -f \"\${HOME}/.solana-motd\" ] && cat \"\${HOME}/.solana-motd\" 1>&2"
} >&9 || ( rm "$SOLANA_LOCK_FILE" && false ) } >&9 || ( rm "$SOLANA_LOCK_FILE" && echo "SOLANA_USER undefined" 1>&2 && false )
9>&- 9>&-
cat > /solana-scratch/id_ecdsa <<EOK cat > /solana-scratch/id_ecdsa <<EOK
$(cat "$SSH_PRIVATE_KEY") $(cat "$SSH_PRIVATE_KEY")
@ -41,5 +41,7 @@ EOM
# XXX: Stamp creation MUST be last! # XXX: Stamp creation MUST be last!
touch /solana-scratch/.instance-startup-complete touch /solana-scratch/.instance-startup-complete
else else
exec 9<"$SOLANA_LOCK_FILE" && flock -s 9 && . "$SOLANA_LOCK_FILE" && exec 9>&-
echo "${INSTANCE_NAME} candidate is already \${SOLANA_LOCK_INSTANCENAME}" 1>&2
false false
fi fi

4
net/scripts/colo-node-onfree-sh
View File

@ -11,7 +11,7 @@
RC=false RC=false
if [ -f "$SOLANA_LOCK_FILE" ]; then if [ -f "$SOLANA_LOCK_FILE" ]; then
exec 9<>"$SOLANA_LOCK_FILE" exec 9<>"$SOLANA_LOCK_FILE"
flock -x -n 9 || exit 1 flock -x -n 9 || ( echo "Failed to acquire lock!" 1>&2 && exit 1 )
. "$SOLANA_LOCK_FILE" . "$SOLANA_LOCK_FILE"
if [ "\$SOLANA_LOCK_USER" = "\$SOLANA_USER" ]; then if [ "\$SOLANA_LOCK_USER" = "\$SOLANA_USER" ]; then
# Begin running process cleanup # Begin running process cleanup
@ -105,6 +105,8 @@ EOAK
fi fi
# End filesystem cleanup # End filesystem cleanup
RC=true RC=true
else
echo "Invalid user: expected \\\"\$SOLANA_LOCK_USER\\\" got \\\"\$SOLANA_USER\\\""
fi fi
9>&- 9>&-
fi fi