mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-09 07:10:34 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work > - The restart chaos harness and the runner e2e suites stop and restart the control plane through one process-tree owner (`tests/runner-e2e/process-tree-owner.ts`) > - The owner signals only process groups whose identity it has proven, and refuses everything when a group's identity becomes uncertain > - Under load a group can turn over between two `ps` snapshots: the observed members exit, and a straggler that nobody saw start is left in the group, reparented away from every owned anchor > - The stopper treated that as fatal on the first inspection, so a K2 graceful stop at load 28 failed in under a second, and a chaos storm wave was marked as a harness error although the server came back > - This pull request makes the stopper re-inspect within its existing deadline until the uncertainty settles. It still never signals the uncertain group, and it fails with the original error if the uncertainty persists > - The benefit is that chaos waves under load stop failing on a harness race, without weakening the rule against signaling unproven processes ## Linked Issues or Issue Description Refs #19470 **What is the problem?** `stopOwnedProcessTree` fails at once with "Owned process group identity became uncertain" when, under load, a group's observed members exit and an unobserved straggler remains for a moment. In a chaos storm this failed a K2 stop 0.9 s after SIGTERM (load 28), and the wave exited as a harness error. **What is the expected behavior?** The stopper waits (within the same grace or forced deadline) for a later inspection that settles the group, and it never signals the uncertain group. If the straggler outlives the deadline, the stop still fails with the same error. **Why does it matter?** A harness-only race must not invalidate a chaos wave, and the fix must not let the harness signal a process whose ownership is not proven. ## What Changed - `tests/runner-e2e/server-stop.ts`: the chaos and e2e server stopper (the actual K2 path) uses the same bounded settle-wait for its graceful observe/signal and its SIGKILL escalation. Live evidence: a K2 at load 13.9 failed in 0.5 s on an ACPX Claude provider group (launcher, reaper, module-hook loader, `claude` runtime) that tore itself down during the drain and was gone 0.4 s later. - `tests/runner-e2e/process-tree-owner.ts`: the uncertainty error now names the unowned members (pid, ppid, pgid, kind, start). `settleUncertainIdentity` is exported and shared. Export the `UNCERTAIN_GROUP_IDENTITY` message prefix. `stopOwnedProcessTree` retries the grace signal, the SIGKILL escalation and the stop check every 100 ms while that error persists, bounded by the existing grace deadline and one forced window (set before escalation and reused by the escalation retry, the stop check and the fallback), so a stop never exceeds gracefulMs + forcedMs. Other errors, and an uncertainty that outlives the deadline, take the existing fallback path unchanged. The owner's identity checks do not change, and neither does `signal()`. - `tests/runner-e2e/process-tree-owner.test.ts`: three tests. An uncertainty that starts only at SIGKILL escalation fails within one forced window and never sends SIGKILL. A brief turnover settles and the stop succeeds without signaling the uncertain group or killing the direct child. A persistent turnover still rejects with "identity became uncertain" and never signals. ## Verification - `pnpm exec vitest run --config tests/runner-e2e/vitest.config.ts tests/runner-e2e/process-tree-owner.test.ts tests/runner-e2e/server-stop.test.ts`: 35 pass across `process-tree-owner.test.ts` and `server-stop.test.ts`, including 5 new tests; the new brief-turnover tests fail on the old stoppers. With the old stopper, the first new test fails: it rejects on the first inspection and then kills the direct child. - `node scripts/typecheck-test-projects.mjs tests/runner-e2e`: passes. ## Risks - Low risk, test infrastructure only. - A stop that hits a persistent uncertainty now fails at the deadline (up to the grace time) instead of at once. It sends no extra signals. ## Model Used - Claude Opus 5.5 (`claude-opus-5-5`), Anthropic, used through Claude Code with tool use (shell, file edits). ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [ ] All Paperclip CI gates are green - [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
166 lines
8.3 KiB
TypeScript
166 lines
8.3 KiB
TypeScript
import type { ChildProcess } from "node:child_process";
|
|
import { createProcessTreeOwner, incompleteTreeFallback, settleUncertainIdentity, type RestartRunnerIdentity } from "./process-tree-owner.js";
|
|
|
|
// The wrapper receives Playwright's group signal; only it signals Paperclip.
|
|
export const runnerE2EServerDetached = process.platform !== "win32";
|
|
const wait = (ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms));
|
|
|
|
export function createRunnerE2EServerStopper(options: {
|
|
gracefulTimeoutMs: number;
|
|
forcedTimeoutMs: number;
|
|
hasSpawnError: (child: ChildProcess) => boolean;
|
|
markExpectedStop: (child: ChildProcess) => void;
|
|
log: (message: string) => void;
|
|
createOwner?: typeof createProcessTreeOwner;
|
|
}) {
|
|
type State = {
|
|
owner: ReturnType<typeof createProcessTreeOwner>;
|
|
promise?: Promise<void>;
|
|
restartPromise?: Promise<void>;
|
|
finalRequested?: boolean;
|
|
finalPhaseStarted?: boolean;
|
|
finalComplete?: boolean;
|
|
gracefulDeadline?: number;
|
|
forcedDeadline?: number;
|
|
gracefulSent: boolean;
|
|
groupSignals: Set<number>;
|
|
escalationLogged: boolean;
|
|
};
|
|
const states = new WeakMap<ChildProcess, State>();
|
|
const watched = new Set<ChildProcess>();
|
|
let finalGraceDeadline: number | undefined;
|
|
let finalForcedDeadline: number | undefined;
|
|
let finalAllPromise: Promise<void> | undefined;
|
|
const exited = (child: ChildProcess) => child.exitCode !== null || child.signalCode !== null || options.hasSpawnError(child);
|
|
function watch(child: ChildProcess) {
|
|
let state = states.get(child);
|
|
if (!state) {
|
|
state = { owner: (options.createOwner ?? createProcessTreeOwner)(child), gracefulSent: false, groupSignals: new Set(), escalationLogged: false };
|
|
states.set(child, state);
|
|
watched.add(child);
|
|
}
|
|
return state;
|
|
}
|
|
async function stopOnce(child: ChildProcess, state: State, signal: NodeJS.Signals, restarting = false) {
|
|
state.gracefulDeadline ??= Date.now() + options.gracefulTimeoutMs;
|
|
// A provider group that tears itself down during the drain can be briefly
|
|
// unproven; wait within the phase deadline, never signaling it meanwhile.
|
|
const grace = () => state.gracefulDeadline!;
|
|
const observe = (until: () => number) => settleUncertainIdentity(() => state.owner.observe(), until);
|
|
await observe(grace);
|
|
if (!exited(child) && !state.gracefulSent) {
|
|
state.gracefulSent = child.kill(signal);
|
|
}
|
|
while (Date.now() < state.gracefulDeadline) {
|
|
await observe(grace);
|
|
if (restarting && state.finalRequested) throw new Error("Final shutdown interrupted controller restart");
|
|
if (exited(child)) {
|
|
if (restarting) {
|
|
state.owner.assertRestartRunnerAlive();
|
|
if (!state.owner.restartCleanupGroups().size) return;
|
|
}
|
|
if (!state.owner.liveGroups().length) { state.owner.stopObserving(); return; }
|
|
// The leader is gone. Retire only descendants whose start identities
|
|
// we observed while they belonged to this server, including private groups.
|
|
const unsignaled = new Set((restarting ? [...state.owner.restartCleanupGroups()] : state.owner.liveGroups().map(group => group.processGroupId)).filter(pid => !state.groupSignals.has(pid)));
|
|
for (const pid of await settleUncertainIdentity(() => state.owner.signal("SIGTERM", unsignaled), grace)) state.groupSignals.add(pid);
|
|
}
|
|
await wait(25);
|
|
}
|
|
if (restarting) throw new Error("Controller restart did not retire non-durable children within its graceful deadline");
|
|
if (!state.escalationLogged) {
|
|
options.log(`\nPaperclip did not stop within ${options.gracefulTimeoutMs}ms; sending SIGKILL\n`);
|
|
state.escalationLogged = true;
|
|
}
|
|
state.forcedDeadline ??= finalForcedDeadline ?? Date.now() + options.forcedTimeoutMs;
|
|
const forced = () => state.forcedDeadline!;
|
|
if (runnerE2EServerDetached) await settleUncertainIdentity(() => state.owner.signal("SIGKILL"), forced);
|
|
else if (!exited(child)) child.kill("SIGKILL");
|
|
do {
|
|
await observe(forced);
|
|
if (exited(child) && !state.owner.liveGroups().length) { state.owner.stopObserving(); return; }
|
|
await wait(25);
|
|
} while (Date.now() < state.forcedDeadline);
|
|
throw new Error("Paperclip server or observed descendants did not exit after SIGKILL");
|
|
}
|
|
const stop = (child: ChildProcess, signal: NodeJS.Signals = "SIGTERM"): Promise<void> => {
|
|
options.markExpectedStop(child);
|
|
const state = watch(child);
|
|
state.finalRequested = true;
|
|
state.promise ??= Promise.resolve().then(async () => {
|
|
if (state.restartPromise && !state.finalPhaseStarted) {
|
|
await state.restartPromise.catch(() => {});
|
|
state.finalPhaseStarted = true;
|
|
// A completed restart is a separate phase, not elapsed cleanup time.
|
|
state.gracefulDeadline = finalGraceDeadline ?? Date.now() + options.gracefulTimeoutMs;
|
|
state.forcedDeadline = undefined;
|
|
state.groupSignals.clear();
|
|
}
|
|
await stopOnce(child, state, signal);
|
|
state.finalComplete = true;
|
|
}).catch(async error => {
|
|
try {
|
|
await incompleteTreeFallback(error, child, state, state.gracefulDeadline!, options.forcedTimeoutMs);
|
|
} finally {
|
|
state.promise = undefined;
|
|
}
|
|
});
|
|
/* Retain the signal/deadline phase so a later audit can recover without
|
|
repeating the graceful signal. */
|
|
return state.promise;
|
|
};
|
|
return Object.assign(stop, {
|
|
assertGracefulExit: (child: ChildProcess): void => {
|
|
const state = states.get(child);
|
|
if (!state?.finalComplete || state.escalationLogged || child.exitCode !== 0 || child.signalCode !== null) {
|
|
throw new Error("Controller did not exit gracefully; forced cleanup cannot qualify a rolling deployment");
|
|
}
|
|
},
|
|
watch: (child: ChildProcess) => watch(child).owner.observe(),
|
|
crashForRestart: (child: ChildProcess): Promise<void> => {
|
|
if (process.platform === "win32") return Promise.reject(new Error("Owned crash restart requires process-group inspection"));
|
|
options.markExpectedStop(child);
|
|
const state = watch(child);
|
|
if (state.finalRequested || state.restartPromise) return Promise.reject(new Error("Restart already requested or final cleanup active"));
|
|
state.restartPromise = (async () => {
|
|
state.gracefulDeadline = Date.now() + options.forcedTimeoutMs;
|
|
await state.owner.signal("SIGKILL");
|
|
await stopOnce(child, state, "SIGKILL");
|
|
})();
|
|
return state.restartPromise;
|
|
},
|
|
forRestart: (child: ChildProcess, identity: RestartRunnerIdentity): Promise<void> => {
|
|
options.markExpectedStop(child);
|
|
const state = watch(child);
|
|
if (state.finalRequested || state.restartPromise) return Promise.reject(new Error("Restart already requested or final cleanup active"));
|
|
state.restartPromise = (async () => {
|
|
await state.owner.preserveRunnerForRestart(identity);
|
|
options.log(`Controller restart preserves admitted runner pid=${identity.processPid} pgid=${identity.processGroupId} started=${identity.processStartedAt}\n`);
|
|
await stopOnce(child, state, "SIGTERM", true);
|
|
})();
|
|
return state.restartPromise;
|
|
},
|
|
stopAll: (signal: NodeJS.Signals = "SIGTERM"): Promise<void> => {
|
|
// Replacement controller drain precedes old daemon retirement. All
|
|
// generations share the original final-cleanup window, including retries.
|
|
finalGraceDeadline ??= Math.min(Date.now() + options.gracefulTimeoutMs,
|
|
...[...watched].map(child => states.get(child)!).filter(state => state.finalRequested && !state.finalComplete
|
|
&& (!state.restartPromise || state.finalPhaseStarted)).map(state => state.gracefulDeadline ?? Infinity));
|
|
finalForcedDeadline ??= finalGraceDeadline + options.forcedTimeoutMs;
|
|
for (const child of watched) {
|
|
const state = states.get(child)!;
|
|
state.finalRequested = true;
|
|
state.gracefulDeadline ??= finalGraceDeadline;
|
|
}
|
|
finalAllPromise ??= Promise.resolve().then(async () => {
|
|
const failures: unknown[] = [];
|
|
for (const child of [...watched].reverse()) {
|
|
try { await stop(child, signal); } catch (error) { failures.push(error); }
|
|
}
|
|
if (failures.length) throw new AggregateError(failures, "Owned server cleanup incomplete");
|
|
}).catch(error => { finalAllPromise = undefined; throw error; });
|
|
return finalAllPromise;
|
|
},
|
|
});
|
|
}
|