Skip to content

Commit 7ec6e48

Browse files
committed
fix(ssh): preserve home during managed launch recovery
1 parent 354671b commit 7ec6e48

2 files changed

Lines changed: 18 additions & 3 deletions

File tree

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,19 @@ process.stdout.write(args[0] === "__ssh-helper"
177177
`#!${process.execPath}
178178
const fs = require("node:fs");
179179
const args = process.argv.slice(2);
180+
if (args[0] === "serve") process.exit(0);
180181
if (args[0] !== "__ssh-helper") process.exit(21);
181182
switch (args[1]) {
182183
case "home-dir": process.stdout.write(process.env.T3CODE_HOME); break;
183184
case "runtime-port": {
184185
const runtime = JSON.parse(fs.readFileSync(args[2], "utf8"));
185186
process.stdout.write(runtime.pid + " " + runtime.port); break;
186187
}
187-
case "wait-ready": process.exit(args[2] === process.env.T3_FIXTURE_READY_PORT ? 0 : 22); break;
188+
case "pick-port": process.stdout.write("41774"); break;
189+
case "wait-ready": {
190+
if (args[2] === "41774" && fs.readFileSync(process.env.T3_FIXTURE_STATE_DIR + "/server-home", "utf8").trim() !== process.env.T3CODE_HOME) process.exit(24);
191+
process.exit(args[2] === process.env.T3_FIXTURE_READY_PORT ? 0 : 22); break;
192+
}
188193
default: process.exit(23);
189194
}`,
190195
{ mode: 0o700 },
@@ -208,6 +213,7 @@ switch (args[1]) {
208213
T3_FIXTURE_ZOMBIE: zombie,
209214
T3CODE_HOME: customHome,
210215
T3_FIXTURE_READY_PORT: readyPort,
216+
T3_FIXTURE_STATE_DIR: stateDir,
211217
},
212218
extendEnv: false,
213219
}),
@@ -246,8 +252,12 @@ switch (args[1]) {
246252
"old runner stays intact",
247253
);
248254
zombie = "1";
249-
readyPort = "41773";
250-
assert.deepEqual(yield* launch, { remotePort: 41773, remoteServerKind: "external" });
255+
readyPort = "41774";
256+
assert.deepEqual(yield* launch, { remotePort: 41774, remoteServerKind: "managed" });
257+
assert.strictEqual(
258+
(yield* fs.readFileString(path.join(stateDir, "server-home"))).trim(),
259+
customHome,
260+
);
251261
assert.isTrue(yield* external.isRunning);
252262
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
253263
);

‎packages/ssh/src/tunnel.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,10 @@ ADOPTED_PID=""
648648
if [ -n "$DEFAULT_RUNTIME_INFO" ]; then
649649
DEFAULT_RUNTIME_PID="\${DEFAULT_RUNTIME_INFO%% *}"
650650
DEFAULT_REMOTE_PORT="\${DEFAULT_RUNTIME_INFO#* }"
651+
if ! server_running "$DEFAULT_RUNTIME_PID"; then
652+
DEFAULT_RUNTIME_PID=""
653+
DEFAULT_REMOTE_PORT=""
654+
fi
651655
fi
652656
# The managed server runs on the default home, so it writes the default
653657
# runtime file too. When that file names the PID this launcher recorded as
@@ -728,6 +732,7 @@ if [ -z "$REMOTE_PORT" ]; then
728732
REMOTE_PID="$!"
729733
printf '%s\\n' "$REMOTE_PID" >"$PID_FILE"
730734
printf '%s\\n' "$REMOTE_PORT" >"$PORT_FILE"
735+
printf '%s\\n' "$DEFAULT_SERVER_HOME" >"$SERVER_HOME_FILE"
731736
printf 'managed\\n' >"$MANAGED_FILE"
732737
if ! wait_ready "@@T3_READY_TIMEOUT_MS@@"; then
733738
printf 'Remote T3 server did not become ready on 127.0.0.1:%s.\\n' "$REMOTE_PORT" >&2

0 commit comments

Comments
 (0)