fix(test): escalate e2e watchdog termination · openclaw/o...

Recent Commits to openclaw:main

vincentkoc · 2026-05-28 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,17 @@ const child = spawn(command, args, {`
`53`	`53`	`stdio: "inherit",`
`54`	`54`	`});`
`55`	`55`	`let timedOut = false;`
	`56`	`+let parentSignal = null;`
	`57`	`+let parentSignalTimer = null;`
	`58`	`+const signalExitCodes = new Map([`
	`59`	`+ ["SIGHUP", 129],`
	`60`	`+ ["SIGINT", 130],`
	`61`	`+ ["SIGTERM", 143],`
	`62`	`+]);`
	`63`	`+const killGraceMs = Number.parseInt(`
	`64`	`+ process.env.OPENCLAW_DOCKER_TIMEOUT_KILL_GRACE_MS \|\| "30000",`
	`65`	`+ 10,`
	`66`	`+);`
`56`	`67`	`const killTarget = process.platform === "win32" ? child.pid : -child.pid;`
`57`	`68`	`const killChild = (signal) => {`
`58`	`69`	`if (!child.pid) {`
`@@ -70,18 +81,35 @@ const timer = setTimeout(() => {`
`70`	`81`	`timedOut = true;`
`71`	`82`	console.error(`Docker command timed out after ${timeoutValue}`);
`72`	`83`	`killChild("SIGTERM");`
`73`		`- setTimeout(() => killChild("SIGKILL"), 30_000).unref();`
	`84`	`+ setTimeout(() => killChild("SIGKILL"), killGraceMs).unref();`
`74`	`85`	`}, timeoutMs);`
`75`	`86`	`const forwardSignal = (signal) => {`
	`87`	`+ if (parentSignal) {`
	`88`	`+ killChild("SIGKILL");`
	`89`	`+ process.exit(signalExitCodes.get(signal) ?? 1);`
	`90`	`+ }`
	`91`	`+ parentSignal = signal;`
	`92`	`+ clearTimeout(timer);`
`76`	`93`	`killChild(signal);`
	`94`	`+ parentSignalTimer = setTimeout(() => {`
	`95`	`+ killChild("SIGKILL");`
	`96`	`+ process.exit(signalExitCodes.get(signal) ?? 1);`
	`97`	`+ }, killGraceMs);`
	`98`	`+ parentSignalTimer.unref();`
`77`	`99`	`};`
`78`	`100`	`process.once("SIGINT", forwardSignal);`
`79`	`101`	`process.once("SIGTERM", forwardSignal);`
`80`	`102`	`child.on("exit", (code, signal) => {`
`81`	`103`	`clearTimeout(timer);`
	`104`	`+ if (parentSignalTimer) {`
	`105`	`+ clearTimeout(parentSignalTimer);`
	`106`	`+ }`
`82`	`107`	`if (timedOut) {`
`83`	`108`	`process.exit(124);`
`84`	`109`	`}`
	`110`	`+ if (parentSignal) {`
	`111`	`+ process.exit(signalExitCodes.get(parentSignal) ?? 1);`
	`112`	`+ }`
`85`	`113`	`if (code !== null) {`
`86`	`114`	`process.exit(code);`
`87`	`115`	`}`

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,17 @@ const child = spawn(command, args, {`
`91`	`91`	`stdio: "inherit",`
`92`	`92`	`});`
`93`	`93`	`let timedOut = false;`
	`94`	`+let parentSignal = null;`
	`95`	`+let parentSignalTimer = null;`
	`96`	`+const signalExitCodes = new Map([`
	`97`	`+ ["SIGHUP", 129],`
	`98`	`+ ["SIGINT", 130],`
	`99`	`+ ["SIGTERM", 143],`
	`100`	`+]);`
	`101`	`+const killGraceMs = Number.parseInt(`
	`102`	`+ process.env.OPENCLAW_E2E_TIMEOUT_KILL_GRACE_MS \|\| "30000",`
	`103`	`+ 10,`
	`104`	`+);`
`94`	`105`	`const killTarget = process.platform === "win32" ? child.pid : -child.pid;`
`95`	`106`	`const killChild = (signal) => {`
`96`	`107`	`if (!child.pid) {`
`@@ -108,18 +119,35 @@ const timer = setTimeout(() => {`
`108`	`119`	`timedOut = true;`
`109`	`120`	console.error(`OpenClaw E2E command timed out after ${timeoutValue}`);
`110`	`121`	`killChild("SIGTERM");`
`111`		`- setTimeout(() => killChild("SIGKILL"), 30_000).unref();`
	`122`	`+ setTimeout(() => killChild("SIGKILL"), killGraceMs).unref();`
`112`	`123`	`}, timeoutMs);`
`113`	`124`	`const forwardSignal = (signal) => {`
	`125`	`+ if (parentSignal) {`
	`126`	`+ killChild("SIGKILL");`
	`127`	`+ process.exit(signalExitCodes.get(signal) ?? 1);`
	`128`	`+ }`
	`129`	`+ parentSignal = signal;`
	`130`	`+ clearTimeout(timer);`
`114`	`131`	`killChild(signal);`
	`132`	`+ parentSignalTimer = setTimeout(() => {`
	`133`	`+ killChild("SIGKILL");`
	`134`	`+ process.exit(signalExitCodes.get(signal) ?? 1);`
	`135`	`+ }, killGraceMs);`
	`136`	`+ parentSignalTimer.unref();`
`115`	`137`	`};`
`116`	`138`	`process.once("SIGINT", forwardSignal);`
`117`	`139`	`process.once("SIGTERM", forwardSignal);`
`118`	`140`	`child.on("close", (code, signal) => {`
`119`	`141`	`clearTimeout(timer);`
	`142`	`+ if (parentSignalTimer) {`
	`143`	`+ clearTimeout(parentSignalTimer);`
	`144`	`+ }`
`120`	`145`	`if (timedOut) {`
`121`	`146`	`process.exit(124);`
`122`	`147`	`}`
	`148`	`+ if (parentSignal) {`
	`149`	`+ process.exit(signalExitCodes.get(parentSignal) ?? 1);`
	`150`	`+ }`
`123`	`151`	`if (code !== null) {`
`124`	`152`	`process.exit(code);`
`125`	`153`	`}`

Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,68 @@ stderr="$(<"$TMPDIR/stderr")"`
`516`	`516`	`}`
`517`	`517`	`});`
`518`	`518`
	`519`	`+it("escalates Docker watchdog children that ignore parent termination", () => {`
	`520`	`+const workDir = mkdtempSync(join(tmpdir(), "openclaw-docker-node-signal-"));`
	`521`	`+`
	`522`	`+try {`
	`523`	`+const binDir = join(workDir, "bin");`
	`524`	`+mkdirSync(binDir);`
	`525`	`+writeFileSync(`
	`526`	`+join(binDir, "node"),`
	`527`	+`#!/bin/bash\nexec ${shellQuote(process.execPath)} "$@"\n`,
	`528`	`+);`
	`529`	`+writeFileSync(`
	`530`	`+join(binDir, "docker"),`
	`531`	+`#!/bin/bash
	`532`	`+printf "%s\\n" "$$" >"$TMPDIR/docker-pid"`
	`533`	`+printf "%s\\n" "$PPID" >"$TMPDIR/watchdog-pid"`
	`534`	`+trap "" TERM`
	`535`	`+while true; do /bin/sleep 1; done`
	`536`	+`,
	`537`	`+);`
	`538`	`+chmodSync(join(binDir, "node"), 0o755);`
	`539`	`+chmodSync(join(binDir, "docker"), 0o755);`
	`540`	`+const rootDir = process.cwd();`
	`541`	+const script = `
	`542`	`+set -euo pipefail`
	`543`	`+ROOT_DIR=${shellQuote(rootDir)}`
	`544`	`+TMPDIR=${shellQuote(workDir)}`
	`545`	`+export ROOT_DIR TMPDIR`
	`546`	`+export PATH="$TMPDIR/bin"`
	`547`	`+export DOCKER_COMMAND_TIMEOUT=30s`
	`548`	`+export OPENCLAW_DOCKER_TIMEOUT_KILL_GRACE_MS=100`
	`549`	`+`
	`550`	`+source "$ROOT_DIR/scripts/lib/docker-e2e-container.sh"`
	`551`	`+`
	`552`	`+docker_e2e_docker_cmd run demo &`
	`553`	`+watchdog_pid="$!"`
	`554`	`+for ((i = 0; i < 100; i += 1)); do`
	`555`	`+ [ -s "$TMPDIR/docker-pid" ] && [ -s "$TMPDIR/watchdog-pid" ] && break`
	`556`	`+ /bin/sleep 0.02`
	`557`	`+done`
	`558`	`+[ -s "$TMPDIR/docker-pid" ]`
	`559`	`+[ -s "$TMPDIR/watchdog-pid" ]`
	`560`	`+kill -TERM "$(/bin/cat "$TMPDIR/watchdog-pid")"`
	`561`	`+set +e`
	`562`	`+wait "$watchdog_pid"`
	`563`	`+status="$?"`
	`564`	`+set -e`
	`565`	`+[ "$status" = "143" ]`
	`566`	`+docker_pid="$(/bin/cat "$TMPDIR/docker-pid")"`
	`567`	`+for ((i = 0; i < 100; i += 1)); do`
	`568`	`+ kill -0 "$docker_pid" 2>/dev/null \|\| exit 0`
	`569`	`+ /bin/sleep 0.02`
	`570`	`+done`
	`571`	`+echo "docker child still alive after watchdog termination" >&2`
	`572`	`+exit 1`
	`573`	+`;
	`574`	`+`
	`575`	`+execFileSync("bash", ["-lc", script], { encoding: "utf8" });`
	`576`	`+} finally {`
	`577`	`+rmSync(workDir, { recursive: true, force: true });`
	`578`	`+}`
	`579`	`+});`
	`580`	`+`
`519`	`581`	`it("uses plain timeout when kill-after is unsupported", () => {`
`520`	`582`	`const workDir = mkdtempSync(join(tmpdir(), "openclaw-docker-plain-timeout-"));`
`521`	`583`

Original file line number	Diff line number	Diff line change
`@@ -378,6 +378,72 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {`
`378`	`378`	`}`
`379`	`379`	`});`
`380`	`380`
	`381`	`+it("escalates Node watchdog children that ignore parent termination", () => {`
	`382`	`+const tempDir = fs.mkdtempSync(`
	`383`	`+path.join(os.tmpdir(), "openclaw-e2e-instance-node-watchdog-signal-"),`
	`384`	`+);`
	`385`	`+try {`
	`386`	`+writeNodeShim(tempDir);`
	`387`	`+const childPath = path.join(tempDir, "ignore-term.cjs");`
	`388`	`+const pidPath = path.join(tempDir, "child.pid");`
	`389`	`+const watchdogPidPath = path.join(tempDir, "watchdog.pid");`
	`390`	`+fs.writeFileSync(`
	`391`	`+childPath,`
	`392`	`+[`
	`393`	`+"const fs = require('node:fs');",`
	`394`	`+"fs.writeFileSync(process.argv[2], String(process.pid));",`
	`395`	`+"fs.writeFileSync(process.argv[3], String(process.ppid));",`
	`396`	`+"process.on('SIGTERM', () => {});",`
	`397`	`+"setInterval(() => {}, 1000);",`
	`398`	`+"",`
	`399`	`+].join("\n"),`
	`400`	`+);`
	`401`	`+`
	`402`	+const script = `
	`403`	`+set -euo pipefail`
	`404`	`+source ${shellQuote(helperPath)}`
	`405`	`+export OPENCLAW_E2E_TIMEOUT_KILL_GRACE_MS=100`
	`406`	`+openclaw_e2e_maybe_timeout 30s node ${shellQuote(childPath)} ${shellQuote(pidPath)} ${shellQuote(watchdogPidPath)} &`
	`407`	`+wrapper_pid="$!"`
	`408`	`+for ((i = 0; i < 100; i += 1)); do`
	`409`	`+ [ -s ${shellQuote(pidPath)} ] && [ -s ${shellQuote(watchdogPidPath)} ] && break`
	`410`	`+ /bin/sleep 0.02`
	`411`	`+done`
	`412`	`+[ -s ${shellQuote(pidPath)} ]`
	`413`	`+[ -s ${shellQuote(watchdogPidPath)} ]`
	`414`	`+kill -TERM "$(/bin/cat ${shellQuote(watchdogPidPath)})"`
	`415`	`+set +e`
	`416`	`+wait "$wrapper_pid"`
	`417`	`+status="$?"`
	`418`	`+set -e`
	`419`	`+[ "$status" = "143" ]`
	`420`	`+child_pid="$(/bin/cat ${shellQuote(pidPath)})"`
	`421`	`+for ((i = 0; i < 100; i += 1)); do`
	`422`	`+ kill -0 "$child_pid" 2>/dev/null \|\| exit 0`
	`423`	`+ /bin/sleep 0.02`
	`424`	`+done`
	`425`	`+echo "child still alive after watchdog termination" >&2`
	`426`	`+exit 1`
	`427`	+`;
	`428`	`+`
	`429`	`+const result = spawnSync(`
	`430`	`+"/bin/bash",`
	`431`	`+["-c", script],`
	`432`	`+{`
	`433`	`+encoding: "utf8",`
	`434`	`+env: shellTestEnv({`
	`435`	`+PATH: tempDir,`
	`436`	`+}),`
	`437`	`+timeout: 5_000,`
	`438`	`+},`
	`439`	`+);`
	`440`	`+`
	`441`	`+expectShellSuccess(result);`
	`442`	`+} finally {`
	`443`	`+fs.rmSync(tempDir, { force: true, recursive: true });`
	`444`	`+}`
	`445`	`+});`
	`446`	`+`
`381`	`447`	`it("bounds HTTP readiness probes when a server accepts connections but never responds", () => {`
`382`	`448`	`const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-e2e-http-probe-"));`
`383`	`449`	`try {`

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

推荐订阅源

Recent Commits to openclaw:main