Skip to content

Commit 3c8b218

Browse files
committed
fix(ssh): recover from stale external server ownership
1 parent b3387ac commit 3c8b218

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

‎packages/ssh/src/tunnel.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ case "$1 $2" in
125125
${scenario === "discovered" || scenario === "managed-recovering" ? `printf '${process.pid} 3773'` : "exit 1"} ;;
126126
'__ssh-helper wait-ready')
127127
printf '%s\\n' "$4" >> "$HOME/probes"
128-
${scenario === "fresh" ? "exit 0" : scenario === "recovering" || scenario === "managed-recovering" ? '[ "$4" -gt 2000 ]' : "exit 1"} ;;
128+
${scenario === "fresh" ? "exit 0" : scenario === "recovering" || scenario === "managed-recovering" ? '[ "$4" -gt 2000 ]' : '[ "$3" = 3774 ]'} ;;
129129
'__ssh-helper pick-port') printf 'pick-port\\n' >> "$HOME/spawns"; printf '3774' ;;
130130
'serve --host') printf 'serve\\n' >> "$HOME/spawns" ;;
131131
*) exit 2 ;;
@@ -140,7 +140,7 @@ esac
140140
timeout: 10_000,
141141
});
142142
assert.isUndefined(result.error);
143-
if (scenario === "fresh") {
143+
if (scenario === "fresh" || scenario === "unavailable" || scenario === "missing-port") {
144144
assert.equal(result.status, 0, result.stderr);
145145
assert.deepEqual(JSON.parse(result.stdout), { remotePort: 3774, serverKind: "managed" });
146146
return;

‎packages/ssh/src/tunnel.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,8 +668,13 @@ if [ "$REMOTE_MANAGED" = "external" ]; then
668668
if server_running "$ADOPTED_PID"; then
669669
:
670670
elif [ -z "$REMOTE_PORT" ] || ! wait_ready "@@T3_READY_TIMEOUT_MS@@"; then
671-
printf 'The external T3 server did not become ready. Retry after its update or restart finishes; no replacement server was started.\\n' >&2
672-
exit 1
671+
if [ -n "$DEFAULT_RUNTIME_PID" ] && server_running "$DEFAULT_RUNTIME_PID"; then
672+
printf 'The external T3 server did not become ready. Retry after its update or restart finishes; no replacement server was started.\\n' >&2
673+
exit 1
674+
fi
675+
REMOTE_PID=""
676+
REMOTE_PORT=""
677+
REMOTE_MANAGED=""
673678
fi
674679
elif [ -n "$REMOTE_PID" ] && [ -n "$REMOTE_PORT" ] && server_running "$REMOTE_PID"; then
675680
# Reconnect owns the local tunnel, not the lifetime of an already running

0 commit comments

Comments
 (0)