惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

爱范儿
爱范儿
WordPress大学
WordPress大学
博客园 - 【当耐特】
The Cloudflare Blog
B
Blog
Last Week in AI
Last Week in AI
小众软件
小众软件
量子位
S
SegmentFault 最新的问题
V
Visual Studio Blog
博客园 - 叶小钗
美团技术团队
阮一峰的网络日志
阮一峰的网络日志
Hugging Face - Blog
Hugging Face - Blog
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
宝玉的分享
宝玉的分享
A
About on SuperTechFans
雷峰网
雷峰网
J
Java Code Geeks
Microsoft Azure Blog
Microsoft Azure Blog
腾讯CDC
MongoDB | Blog
MongoDB | Blog
酷 壳 – CoolShell
酷 壳 – CoolShell
Martin Fowler
Martin Fowler

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(gateway): drain replies during restart close · opencl...
vincentkoc · 2026-05-17 · via Recent Commits to openclaw:main

@@ -1,4 +1,5 @@

11

import { describe, expect, it, vi } from "vitest";

2+

import type { GatewayServer } from "../../gateway/server.impl.js";

23

import type { GatewayBonjourBeacon } from "../../infra/bonjour-discovery.js";

34

import { pickBeaconHost, pickGatewayPort } from "./discover.js";

45

@@ -249,13 +250,33 @@ function createRuntimeWithExitSignal(exitCallOrder?: string[]) {

249250

return { runtime, exited };

250251

}

251252252-

type GatewayCloseFn = (...args: unknown[]) => Promise<void>;

253+

type GatewayCloseFn = GatewayServer["close"];

253254

type LoopRuntime = {

254255

log: (...args: unknown[]) => void;

255256

error: (...args: unknown[]) => void;

256257

exit: (code: number) => void;

257258

};

258259260+

function createCloseMock() {

261+

return vi.fn<GatewayCloseFn>(async (_opts) => {});

262+

}

263+264+

function expectRestartCloseCall(

265+

close: ReturnType<typeof createCloseMock>,

266+

maxDrainTimeoutMs: number,

267+

) {

268+

expect(close).toHaveBeenCalledWith(

269+

expect.objectContaining({

270+

reason: "gateway restarting",

271+

restartExpectedMs: 1500,

272+

drainTimeoutMs: expect.any(Number),

273+

}),

274+

);

275+

const closeArgs = close.mock.calls[0]?.[0];

276+

expect(closeArgs?.drainTimeoutMs).toBeLessThanOrEqual(maxDrainTimeoutMs);

277+

expect(closeArgs?.drainTimeoutMs).toBeGreaterThanOrEqual(0);

278+

}

279+259280

function createSignaledStart(close: GatewayCloseFn) {

260281

let resolveStarted: (() => void) | null = null;

261282

const started = new Promise<void>((resolve) => {

@@ -304,7 +325,7 @@ async function waitForLoopCondition(predicate: () => boolean, message: string) {

304325

}

305326306327

async function createSignaledLoopHarness(exitCallOrder?: string[]) {

307-

const close = vi.fn(async () => {});

328+

const close = createCloseMock();

308329

const { start, started } = createSignaledStart(close);

309330

const { runtime, exited } = createRuntimeWithExitSignal(exitCallOrder);

310331

const { loopPromise } = await runLoopWithStart({ start, runtime });

@@ -361,8 +382,8 @@ describe("runGatewayLoop", () => {

361382

getActiveTaskCount.mockReturnValueOnce(1).mockReturnValue(0);

362383363384

await withIsolatedSignals(async ({ captureSignal }) => {

364-

const closeFirst = vi.fn(async () => {});

365-

const closeSecond = vi.fn(async () => {});

385+

const closeFirst = createCloseMock();

386+

const closeSecond = createCloseMock();

366387

const { runtime, exited } = createRuntimeWithExitSignal();

367388

let resolveSecond: (() => void) | null = null;

368389

const startedSecond = new Promise<void>((resolve) => {

@@ -391,10 +412,7 @@ describe("runGatewayLoop", () => {

391412

expect(consumeGatewayRestartIntentPayloadSync).toHaveBeenCalledOnce();

392413

expect(markGatewayDraining).toHaveBeenCalledOnce();

393414

expect(waitForActiveTasks).toHaveBeenCalledWith(90_000);

394-

expect(closeFirst).toHaveBeenCalledWith({

395-

reason: "gateway restarting",

396-

restartExpectedMs: 1500,

397-

});

415+

expectRestartCloseCall(closeFirst, 90_000);

398416

await startedSecond;

399417

expect(start).toHaveBeenCalledTimes(2);

400418

await new Promise<void>((resolve) => setImmediate(resolve));

@@ -430,6 +448,27 @@ describe("runGatewayLoop", () => {

430448

});

431449

});

432450451+

it("caps reply drain time for unbounded SIGTERM restarts", async () => {

452+

vi.clearAllMocks();

453+

consumeGatewayRestartIntentPayloadSync.mockReturnValueOnce({ waitMs: 0 });

454+455+

await withIsolatedSignals(async ({ captureSignal }) => {

456+

const { close, start, exited } = await createSignaledLoopHarness();

457+

const sigterm = captureSignal("SIGTERM");

458+

const sigint = captureSignal("SIGINT");

459+460+

sigterm();

461+

await new Promise<void>((resolve) => setImmediate(resolve));

462+

await new Promise<void>((resolve) => setImmediate(resolve));

463+464+

expectRestartCloseCall(close, 15_000);

465+

expect(start).toHaveBeenCalledTimes(2);

466+467+

sigint();

468+

await expect(exited).resolves.toBe(0);

469+

});

470+

});

471+433472

it("aborts active embedded runs after a short restart drain grace", async () => {

434473

vi.clearAllMocks();

435474

consumeGatewayRestartIntentPayloadSync.mockReturnValueOnce({});

@@ -473,10 +512,7 @@ describe("runGatewayLoop", () => {

473512

expect(gatewayLog.warn).toHaveBeenCalledWith(

474513

"failed to mark interrupted main sessions for restart recovery: Error: store read-only",

475514

);

476-

expect(close).toHaveBeenCalledWith({

477-

reason: "gateway restarting",

478-

restartExpectedMs: 1500,

479-

});

515+

expectRestartCloseCall(close, 90_000);

480516

expect(start).toHaveBeenCalledTimes(2);

481517482518

sigint();

@@ -567,12 +603,12 @@ describe("runGatewayLoop", () => {

567603

waitForActiveEmbeddedRuns.mockResolvedValueOnce({ drained: true });

568604569605

type StartServer = () => Promise<{

570-

close: (opts: { reason: string; restartExpectedMs: number | null }) => Promise<void>;

606+

close: GatewayCloseFn;

571607

}>;

572608573-

const closeFirst = vi.fn(async () => {});

574-

const closeSecond = vi.fn(async () => {});

575-

const closeThird = vi.fn(async () => {});

609+

const closeFirst = createCloseMock();

610+

const closeSecond = createCloseMock();

611+

const closeThird = createCloseMock();

576612

const { runtime, exited } = createRuntimeWithExitSignal();

577613578614

const start = vi.fn<StartServer>();

@@ -639,10 +675,7 @@ describe("runGatewayLoop", () => {

639675

});

640676

expect(markGatewayDraining).toHaveBeenCalledTimes(1);

641677

expect(gatewayLog.warn).toHaveBeenCalledWith(DRAIN_TIMEOUT_LOG);

642-

expect(closeFirst).toHaveBeenCalledWith({

643-

reason: "gateway restarting",

644-

restartExpectedMs: 1500,

645-

});

678+

expectRestartCloseCall(closeFirst, 1_234);

646679

expect(markGatewaySigusr1RestartHandled).toHaveBeenCalledTimes(1);

647680

expect(resetAllLanes).toHaveBeenCalledTimes(1);

648681

expect(resetGatewayRestartStateForInProcessRestart).toHaveBeenCalledTimes(1);

@@ -652,10 +685,7 @@ describe("runGatewayLoop", () => {

652685653686

await startedThird;

654687

await new Promise<void>((resolve) => setImmediate(resolve));

655-

expect(closeSecond).toHaveBeenCalledWith({

656-

reason: "gateway restarting",

657-

restartExpectedMs: 1500,

658-

});

688+

expectRestartCloseCall(closeSecond, 1_234);

659689

expect(markGatewaySigusr1RestartHandled).toHaveBeenCalledTimes(2);

660690

expect(markGatewayDraining).toHaveBeenCalledTimes(2);

661691

expect(resetAllLanes).toHaveBeenCalledTimes(2);

@@ -681,8 +711,8 @@ describe("runGatewayLoop", () => {

681711

});

682712683713

await withIsolatedSignals(async ({ captureSignal }) => {

684-

const closeFirst = vi.fn(async () => {});

685-

const closeSecond = vi.fn(async () => {});

714+

const closeFirst = createCloseMock();

715+

const closeSecond = createCloseMock();

686716

const { runtime, exited } = createRuntimeWithExitSignal();

687717

let releaseFirstStart!: () => void;

688718

const firstStartMayReturn = new Promise<void>((resolve) => {

@@ -729,10 +759,7 @@ describe("runGatewayLoop", () => {

729759

"expected queued SIGUSR1 to trigger the second gateway start",

730760

);

731761

await startedSecond;

732-

expect(closeFirst).toHaveBeenCalledWith({

733-

reason: "gateway restarting",

734-

restartExpectedMs: 1500,

735-

});

762+

expectRestartCloseCall(closeFirst, 90_000);

736763

expect(markGatewaySigusr1RestartHandled).toHaveBeenCalledTimes(1);

737764

expect(markGatewayDraining).toHaveBeenCalledTimes(1);

738765

expect(resetAllLanes).toHaveBeenCalledTimes(1);

@@ -869,8 +896,8 @@ describe("runGatewayLoop", () => {

869896

});

870897871898

await withIsolatedSignals(async ({ captureSignal }) => {

872-

const closeFirst = vi.fn(async () => {});

873-

const closeThird = vi.fn(async () => {});

899+

const closeFirst = createCloseMock();

900+

const closeThird = createCloseMock();

874901

const { runtime, exited } = createRuntimeWithExitSignal();

875902

let sigusr1: (() => void) | null = null;

876903

let resolveThirdStart: (() => void) | null = null;

@@ -909,10 +936,7 @@ describe("runGatewayLoop", () => {

909936

"expected queued SIGUSR1 to advance past failed restart startup",

910937

);

911938

await startedThird;

912-

expect(closeFirst).toHaveBeenCalledWith({

913-

reason: "gateway restarting",

914-

restartExpectedMs: 1500,

915-

});

939+

expectRestartCloseCall(closeFirst, 90_000);

916940

expect(markGatewaySigusr1RestartHandled).toHaveBeenCalledTimes(2);

917941

expect(markGatewayDraining).toHaveBeenCalledTimes(2);

918942

expect(resetAllLanes).toHaveBeenCalledTimes(2);

@@ -938,8 +962,8 @@ describe("runGatewayLoop", () => {

938962

});

939963940964

await withIsolatedSignals(async ({ captureSignal }) => {

941-

const closeFirst = vi.fn(async () => {});

942-

const closeThird = vi.fn(async () => {});

965+

const closeFirst = createCloseMock();

966+

const closeThird = createCloseMock();

943967

const { runtime, exited } = createRuntimeWithExitSignal();

944968

let resolveThirdStart: (() => void) | null = null;

945969

const startedThird = new Promise<void>((resolve) => {

@@ -980,10 +1004,7 @@ describe("runGatewayLoop", () => {

9801004

"expected post-failure SIGUSR1 to retry gateway startup",

9811005

);

9821006

await startedThird;

983-

expect(closeFirst).toHaveBeenCalledWith({

984-

reason: "gateway restarting",

985-

restartExpectedMs: 1500,

986-

});

1007+

expectRestartCloseCall(closeFirst, 90_000);

9871008

expect(markGatewaySigusr1RestartHandled).toHaveBeenCalledTimes(2);

9881009

expect(markGatewayDraining).toHaveBeenCalledTimes(2);

9891010

expect(resetAllLanes).toHaveBeenCalledTimes(2);