fix(process): stop cancelled Swift helper builds before removing their files
Cancelling the macOS process-ownership helper build left swiftc object files in TMPDIR. Node's execFile sends SIGTERM on abort and rejects before the child exits, and swift-driver runs each frontend job in its own process group: on SIGTERM the driver exits while a job keeps writing, so REA removed its root while objects were still being written outside and inside it. Add an opt-in `stopSignal` to execFileOutput that stops the process with the caller's signal on abort or timeout and settles only after it exits. Swift helper builds stop swiftc with SIGINT, on which swift-driver stops its jobs and deletes their objects, and point TMPDIR inside the root cleanup removes. Fixes #1173 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
4fb2f3e6ed
commit
c717204795
@@ -1,5 +1,10 @@
|
||||
import { access, readFile } from "node:fs/promises";
|
||||
import { join } from "node:path";
|
||||
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js";
|
||||
|
||||
import { execFileOutput } from "./ExecFileOutput.js";
|
||||
|
||||
describe("execFileOutput", () => {
|
||||
@@ -32,4 +37,61 @@ describe("execFileOutput", () => {
|
||||
]),
|
||||
).rejects.toMatchObject({ code: 7, stdout: "out", stderr: "err" });
|
||||
});
|
||||
|
||||
it.skipIf(process.platform === "win32")(
|
||||
"stops an aborted process with the caller's signal and settles after it exits",
|
||||
async () => {
|
||||
const directory = await createTestTempDirectory("rea-exec-stop-");
|
||||
const ready = join(directory, "ready");
|
||||
const stopped = join(directory, "stopped");
|
||||
// The child records the signal it received only after a cleanup delay.
|
||||
const script = [
|
||||
'const fs = require("node:fs");',
|
||||
'for (const name of ["SIGINT", "SIGTERM"])',
|
||||
` process.on(name, () => setTimeout(() => { fs.writeFileSync(${JSON.stringify(stopped)}, name); process.exit(0); }, 200));`,
|
||||
`fs.writeFileSync(${JSON.stringify(ready)}, "");`,
|
||||
"setInterval(() => {}, 1000);",
|
||||
].join("\n");
|
||||
const controller = new AbortController();
|
||||
const execution = execFileOutput(process.execPath, ["-e", script], {
|
||||
signal: controller.signal,
|
||||
stopSignal: "SIGINT",
|
||||
}).then(
|
||||
() => undefined,
|
||||
async (cause: unknown) => ({
|
||||
cause,
|
||||
stoppedBeforeSettling: await readFile(stopped, "utf8").catch(
|
||||
() => null,
|
||||
),
|
||||
}),
|
||||
);
|
||||
for (let attempt = 0; attempt < 500; attempt += 1) {
|
||||
if (
|
||||
await access(ready).then(
|
||||
() => true,
|
||||
() => false,
|
||||
)
|
||||
)
|
||||
break;
|
||||
await new Promise((resolve) => setTimeout(resolve, 10));
|
||||
}
|
||||
|
||||
controller.abort();
|
||||
const outcome = await execution;
|
||||
|
||||
expect(outcome?.cause).toMatchObject({ name: "AbortError" });
|
||||
expect(outcome?.stoppedBeforeSettling).toBe("SIGINT");
|
||||
},
|
||||
);
|
||||
|
||||
it("rejects an already aborted stoppable command without starting it", async () => {
|
||||
const controller = new AbortController();
|
||||
controller.abort();
|
||||
await expect(
|
||||
execFileOutput(process.execPath, ["-e", ""], {
|
||||
signal: controller.signal,
|
||||
stopSignal: "SIGINT",
|
||||
}),
|
||||
).rejects.toMatchObject({ name: "AbortError" });
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user