Skip to content

Commit 6016bfa

Browse files
fix(ssh): launch-lock recovery backs off while another launch recovers
A waiter that cannot take the recovery lock now sleeps and counts toward the lock-wait limit instead of retrying at once, and a launch killed by SIGPIPE from a dropped SSH session also releases its lock. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 5dc07d5 commit 6016bfa

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

‎packages/ssh/src/tunnel.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,9 @@ cleanup_launch() {
564564
done
565565
}
566566
trap cleanup_launch EXIT
567-
# A dropped SSH session signals the launch; exit so the lock is released.
568-
trap 'exit 1' HUP INT TERM
567+
# A dropped SSH session signals the launch (PIPE on its next write); exit so
568+
# the lock is released.
569+
trap 'exit 1' HUP INT PIPE TERM
569570
cat >"$RUNNER_NEXT" <<'SH'
570571
@@T3_RUNNER_SCRIPT@@
571572
SH
@@ -588,7 +589,7 @@ discard_stale_launch_lock() {
588589
if [ -z "$LAUNCH_BREAK_OWNER" ] || ! kill -0 "$LAUNCH_BREAK_OWNER" 2>/dev/null; then
589590
rm -f "$LAUNCH_BREAK_LOCK"
590591
fi
591-
return 0
592+
return 1
592593
fi
593594
if [ "$(cat "$LAUNCH_LOCK" 2>/dev/null || true)" = "$1" ]; then
594595
rm -f "$LAUNCH_LOCK"
@@ -605,15 +606,13 @@ while ! (set -C; printf '%s\\n' "$$" >"$LAUNCH_LOCK") 2>/dev/null; do
605606
LAUNCH_LOCK_OWNER="$(cat "$LAUNCH_LOCK" 2>/dev/null || true)"
606607
if [ -n "$LAUNCH_LOCK_OWNER" ]; then
607608
LAUNCH_LOCK_UNOWNED=0
608-
if ! kill -0 "$LAUNCH_LOCK_OWNER" 2>/dev/null; then
609-
discard_stale_launch_lock "$LAUNCH_LOCK_OWNER"
609+
if ! kill -0 "$LAUNCH_LOCK_OWNER" 2>/dev/null && discard_stale_launch_lock "$LAUNCH_LOCK_OWNER"; then
610610
continue
611611
fi
612612
else
613613
LAUNCH_LOCK_UNOWNED=$((LAUNCH_LOCK_UNOWNED + 1))
614-
if [ "$LAUNCH_LOCK_UNOWNED" -ge 5 ]; then
614+
if [ "$LAUNCH_LOCK_UNOWNED" -ge 5 ] && discard_stale_launch_lock ""; then
615615
LAUNCH_LOCK_UNOWNED=0
616-
discard_stale_launch_lock ""
617616
continue
618617
fi
619618
fi

0 commit comments

Comments
 (0)