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
@@ -6,7 +6,29 @@ import {
|
||||
type ExecFileOutputOptions = Omit<
|
||||
ExecFileOptionsWithStringEncoding,
|
||||
"encoding" | "maxBuffer"
|
||||
> & { readonly maxBuffer?: number };
|
||||
> & {
|
||||
readonly maxBuffer?: number;
|
||||
/**
|
||||
* Signal that stops the process on abort or timeout. The promise then
|
||||
* settles only after the process exits, so the caller can remove files it
|
||||
* writes; a process still running after a grace period is killed. Without
|
||||
* it, Node's execFile sends SIGTERM on abort and rejects before the
|
||||
* process exits.
|
||||
*/
|
||||
readonly stopSignal?: NodeJS.Signals;
|
||||
};
|
||||
|
||||
/** How long a stopped process may take to exit before it is killed. */
|
||||
const STOP_GRACE_MS = 5_000;
|
||||
|
||||
const abortError = (signal: AbortSignal): Error => {
|
||||
const error = new Error("The operation was aborted", {
|
||||
cause: signal.reason,
|
||||
});
|
||||
error.name = "AbortError";
|
||||
Reflect.set(error, "code", "ABORT_ERR");
|
||||
return error;
|
||||
};
|
||||
|
||||
/** Captured subprocess output read from an execFileOutput rejection. */
|
||||
export interface ExecFileOutputFailure {
|
||||
@@ -47,22 +69,49 @@ export const execFileOutput = (
|
||||
options: ExecFileOutputOptions = {},
|
||||
): Promise<{ readonly stdout: string; readonly stderr: string }> =>
|
||||
new Promise((resolve, reject) => {
|
||||
execFile(
|
||||
const { stopSignal, signal, ...execOptions } = options;
|
||||
const stopped =
|
||||
stopSignal === undefined || signal === undefined
|
||||
? undefined
|
||||
: { signal, stopSignal };
|
||||
if (stopped?.signal.aborted === true) {
|
||||
reject(abortError(stopped.signal));
|
||||
return;
|
||||
}
|
||||
let aborted = false;
|
||||
let grace: NodeJS.Timeout | undefined;
|
||||
const child = execFile(
|
||||
command,
|
||||
[...arguments_],
|
||||
{
|
||||
...options,
|
||||
...execOptions,
|
||||
...(stopped === undefined
|
||||
? signal === undefined
|
||||
? {}
|
||||
: { signal }
|
||||
: { killSignal: stopped.stopSignal }),
|
||||
encoding: "utf8",
|
||||
maxBuffer: options.maxBuffer ?? Number.POSITIVE_INFINITY,
|
||||
},
|
||||
(error, stdout, stderr) => {
|
||||
if (error !== null) {
|
||||
Reflect.set(error, "stdout", stdout);
|
||||
Reflect.set(error, "stderr", stderr);
|
||||
reject(error);
|
||||
stopped?.signal.removeEventListener("abort", onAbort);
|
||||
clearTimeout(grace);
|
||||
const failure =
|
||||
aborted && stopped !== undefined ? abortError(stopped.signal) : error;
|
||||
if (failure !== null) {
|
||||
Reflect.set(failure, "stdout", stdout);
|
||||
Reflect.set(failure, "stderr", stderr);
|
||||
reject(failure);
|
||||
return;
|
||||
}
|
||||
resolve({ stdout, stderr });
|
||||
},
|
||||
);
|
||||
const onAbort = (): void => {
|
||||
if (stopped === undefined) return;
|
||||
aborted = true;
|
||||
child.kill(stopped.stopSignal);
|
||||
grace = setTimeout(() => child.kill("SIGKILL"), STOP_GRACE_MS);
|
||||
};
|
||||
stopped?.signal.addEventListener("abort", onAbort, { once: true });
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user