diff --git a/net/scripts/colo-node-onacquire-sh b/net/scripts/colo-node-onacquire-sh index b3a7115cb7..c2a7f67671 100644 --- a/net/scripts/colo-node-onacquire-sh +++ b/net/scripts/colo-node-onacquire-sh @@ -10,12 +10,12 @@ if [ ! -f "$SOLANA_LOCK_FILE" ]; then 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" ] && { echo "export SOLANA_LOCK_USER=\$SOLANA_USER" echo "export SOLANA_LOCK_INSTANCENAME=$INSTANCE_NAME" 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>&- cat > /solana-scratch/id_ecdsa <&- + echo "${INSTANCE_NAME} candidate is already \${SOLANA_LOCK_INSTANCENAME}" 1>&2 false fi diff --git a/net/scripts/colo-node-onfree-sh b/net/scripts/colo-node-onfree-sh index fcdf8e91fc..726787fde6 100644 --- a/net/scripts/colo-node-onfree-sh +++ b/net/scripts/colo-node-onfree-sh @@ -11,7 +11,7 @@ RC=false if [ -f "$SOLANA_LOCK_FILE" ]; then 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" if [ "\$SOLANA_LOCK_USER" = "\$SOLANA_USER" ]; then # Begin running process cleanup @@ -105,6 +105,8 @@ EOAK fi # End filesystem cleanup RC=true + else + echo "Invalid user: expected \\\"\$SOLANA_LOCK_USER\\\" got \\\"\$SOLANA_USER\\\"" fi 9>&- fi