fix(qa-lab): wait for gateway child process groups · open...

Recent Commits to openclaw:main

vincentkoc · 2026-06-18 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -978,6 +978,47 @@ describe("buildQaRuntimeEnv", () => {`
`978`	`978`	`expect([child.exitCode, child.signalCode]).not.toEqual([null, null]);`
`979`	`979`	`});`
`980`	`980`
	`981`	`+it("does not trust an exited gateway wrapper while its process group is alive", async () => {`
	`982`	`+const child = Object.assign(new EventEmitter(), {`
	`983`	`+pid: 12346,`
	`984`	`+exitCode: 0 as number \| null,`
	`985`	`+signalCode: null as string \| null,`
	`986`	`+kill: vi.fn(),`
	`987`	`+});`
	`988`	`+let sawForceKill = false;`
	`989`	`+let postKillLivenessChecks = 0;`
	`990`	`+const processKill = vi.spyOn(process, "kill").mockImplementation((_pid, signal) => {`
	`991`	`+if (signal === "SIGKILL") {`
	`992`	`+sawForceKill = true;`
	`993`	`+return true;`
	`994`	`+}`
	`995`	`+if (signal === 0 && sawForceKill) {`
	`996`	`+postKillLivenessChecks += 1;`
	`997`	`+if (postKillLivenessChecks >= 2) {`
	`998`	`+throw Object.assign(new Error("no such process"), { code: "ESRCH" });`
	`999`	`+}`
	`1000`	`+}`
	`1001`	`+return true;`
	`1002`	`+});`
	`1003`	`+`
	`1004`	`+await testing.stopQaGatewayChildProcessTree(`
	`1005`	`+child as unknown as Parameters<typeof testing.stopQaGatewayChildProcessTree>[0],`
	`1006`	`+{`
	`1007`	`+gracefulTimeoutMs: 1,`
	`1008`	`+forceTimeoutMs: 50,`
	`1009`	`+},`
	`1010`	`+);`
	`1011`	`+`
	`1012`	`+if (process.platform === "win32") {`
	`1013`	`+expect(child.kill).not.toHaveBeenCalled();`
	`1014`	`+} else {`
	`1015`	`+expect(processKill).toHaveBeenCalledWith(-12346, "SIGTERM");`
	`1016`	`+expect(processKill).toHaveBeenCalledWith(-12346, "SIGKILL");`
	`1017`	`+expect(postKillLivenessChecks).toBe(2);`
	`1018`	`+expect(child.kill).not.toHaveBeenCalled();`
	`1019`	`+}`
	`1020`	`+});`
	`1021`	`+`
`981`	`1022`	`it("treats bind collisions as retryable gateway startup errors", () => {`
`982`	`1023`	`expect(`
`983`	`1024`	`testing.isRetryableGatewayStartupError(`

Original file line number	Diff line number	Diff line change
`@@ -354,6 +354,28 @@ function hasChildExited(child: ChildProcess) {`
`354`	`354`	`return child.exitCode !== null \|\| child.signalCode !== null;`
`355`	`355`	`}`
`356`	`356`
	`357`	`+function isProcessAlreadyExitedError(error: unknown): boolean {`
	`358`	`+return (error as NodeJS.ErrnoException \| undefined)?.code === "ESRCH";`
	`359`	`+}`
	`360`	`+`
	`361`	`+function isQaGatewayChildProcessTreeAlive(child: ChildProcess) {`
	`362`	`+if (!child.pid) {`
	`363`	`+return false;`
	`364`	`+}`
	`365`	`+if (process.platform === "win32") {`
	`366`	`+return !hasChildExited(child);`
	`367`	`+}`
	`368`	`+try {`
	`369`	`+process.kill(-child.pid, 0);`
	`370`	`+return true;`
	`371`	`+} catch (error) {`
	`372`	`+if (isProcessAlreadyExitedError(error)) {`
	`373`	`+return false;`
	`374`	`+}`
	`375`	`+return !hasChildExited(child);`
	`376`	`+}`
	`377`	`+}`
	`378`	`+`
`357`	`379`	`function signalQaGatewayChildProcessTree(child: ChildProcess, signal: NodeJS.Signals) {`
`358`	`380`	`if (!child.pid) {`
`359`	`381`	`return;`
`@@ -374,22 +396,21 @@ function signalQaGatewayChildProcessTree(child: ChildProcess, signal: NodeJS.Sig`
`374`	`396`	`}`
`375`	`397`
`376`	`398`	`async function waitForQaGatewayChildExit(child: ChildProcess, timeoutMs: number) {`
`377`		`-if (hasChildExited(child)) {`
`378`		`-return true;`
	`399`	`+const deadline = Date.now() + timeoutMs;`
	`400`	`+while (Date.now() <= deadline) {`
	`401`	`+if (!isQaGatewayChildProcessTreeAlive(child)) {`
	`402`	`+return true;`
	`403`	`+}`
	`404`	`+await sleep(Math.min(25, Math.max(0, deadline - Date.now())));`
`379`	`405`	`}`
`380`		`-return await Promise.race([`
`381`		`-new Promise<boolean>((resolve) => {`
`382`		`-child.once("exit", () => resolve(true));`
`383`		`-}),`
`384`		`-sleep(timeoutMs).then(() => false),`
`385`		`-]);`
	`406`	`+return !isQaGatewayChildProcessTreeAlive(child);`
`386`	`407`	`}`
`387`	`408`
`388`	`409`	`async function stopQaGatewayChildProcessTree(`
`389`	`410`	`child: ChildProcess,`
`390`	`411`	`opts?: { gracefulTimeoutMs?: number; forceTimeoutMs?: number },`
`391`	`412`	`) {`
`392`		`-if (hasChildExited(child)) {`
	`413`	`+if (!isQaGatewayChildProcessTreeAlive(child)) {`
`393`	`414`	`return;`
`394`	`415`	`}`
`395`	`416`	`signalQaGatewayChildProcessTree(child, "SIGTERM");`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main