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

推荐订阅源

让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
美团技术团队
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
月光博客
月光博客
J
Java Code Geeks
Jina AI
Jina AI
罗磊的独立博客
宝玉的分享
宝玉的分享
S
SegmentFault 最新的问题
D
DataBreaches.Net
博客园 - 叶小钗
腾讯CDC
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
Last Week in AI
Last Week in AI
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
Google DeepMind News
Google DeepMind News
阮一峰的网络日志
阮一峰的网络日志
B
Blog
V
Visual Studio Blog
雷峰网
雷峰网
博客园 - 【当耐特】
Apple Machine Learning Research
Apple Machine Learning Research
Engineering at Meta
Engineering at Meta
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报

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): harden startup restart queue (#82660) (than...
steipete · 2026-05-17 · via Recent Commits to openclaw:main

@@ -112,6 +112,8 @@ export async function runGatewayLoop(params: {

112112

// The HTTP server can report ready before params.start returns its close handle.

113113

// Defer lifecycle signals from that window until the loop can close and advance.

114114

let pendingStartupRequest: GatewayRunSignalRequest | null = null;

115+

let pendingStartupForceExitTimer: ReturnType<typeof setTimeout> | null = null;

116+

let restartDrainingMarkPromise: Promise<void> | null = null;

115117

let startupFailedWithoutServerHandle = false;

116118

const processInstanceId = randomUUID();

117119

const waitForHealthyChild = params.waitForHealthyChild ?? waitForHealthyGatewayChild;

@@ -305,6 +307,32 @@ export async function runGatewayLoop(params: {

305307306308

const SUPERVISOR_STOP_TIMEOUT_MS = 30_000;

307309

const SHUTDOWN_TIMEOUT_MS = SUPERVISOR_STOP_TIMEOUT_MS - 5_000;

310+

const clearPendingStartupForceExitTimer = () => {

311+

if (!pendingStartupForceExitTimer) {

312+

return;

313+

}

314+

clearTimeout(pendingStartupForceExitTimer);

315+

pendingStartupForceExitTimer = null;

316+

};

317+

const armPendingStartupForceExitTimer = () => {

318+

if (pendingStartupForceExitTimer) {

319+

return;

320+

}

321+

pendingStartupForceExitTimer = setTimeout(() => {

322+

pendingStartupForceExitTimer = null;

323+

gatewayLog.error(

324+

"startup restart request timed out before gateway returned a close handle; exiting for supervisor recovery",

325+

);

326+

void (async () => {

327+

try {

328+

await writeStabilityBundle("gateway.restart_startup_request_timeout");

329+

} finally {

330+

exitProcess(1);

331+

}

332+

})();

333+

}, SHUTDOWN_TIMEOUT_MS);

334+

pendingStartupForceExitTimer.unref?.();

335+

};

308336

const resolveRestartDrainTimeoutMs = async (

309337

restartIntent?: RestartIntentOptions,

310338

): Promise<RestartDrainTimeoutMs> => {

@@ -323,6 +351,18 @@ export async function runGatewayLoop(params: {

323351

return DEFAULT_RESTART_DRAIN_TIMEOUT_MS;

324352

}

325353

};

354+

const markRestartDraining = async () => {

355+

if (!restartDrainingMarkPromise) {

356+

restartDrainingMarkPromise = (async () => {

357+

const { markGatewayDraining } = await loadGatewayLifecycleRuntimeModule();

358+

markGatewayDraining();

359+

})().catch((err) => {

360+

restartDrainingMarkPromise = null;

361+

throw err;

362+

});

363+

}

364+

await restartDrainingMarkPromise;

365+

};

326366327367

const runAcceptedRequest = ({

328368

action,

@@ -404,7 +444,6 @@ export async function runGatewayLoop(params: {

404444

getInspectableActiveTaskRestartBlockers,

405445

getActiveEmbeddedRunCount,

406446

getActiveTaskCount,

407-

markGatewayDraining,

408447

waitForActiveEmbeddedRuns,

409448

waitForActiveTasks,

410449

} = await loadGatewayLifecycleRuntimeModule();

@@ -439,7 +478,7 @@ export async function runGatewayLoop(params: {

439478440479

// Reject new enqueues immediately during the drain window so

441480

// sessions get an explicit restart error instead of silent task loss.

442-

markGatewayDraining();

481+

await markRestartDraining();

443482

const activeTasks = getActiveTaskCount();

444483

const activeRuns = getActiveEmbeddedRunCount();

445484

activeTasksAtDrainStart = activeTasks;

@@ -540,6 +579,7 @@ export async function runGatewayLoop(params: {

540579

}

541580

const request = pendingStartupRequest;

542581

pendingStartupRequest = null;

582+

clearPendingStartupForceExitTimer();

543583

startupFailedWithoutServerHandle = false;

544584

runAcceptedRequest(request);

545585

};

@@ -554,6 +594,7 @@ export async function runGatewayLoop(params: {

554594

if (action === "stop" && pendingStartupRequest && !server) {

555595

gatewayLog.info(`received ${signal}; overriding pending startup restart with shutdown`);

556596

pendingStartupRequest = null;

597+

clearPendingStartupForceExitTimer();

557598

startupFailedWithoutServerHandle = false;

558599

runAcceptedRequest(acceptedRequest);

559600

return;

@@ -583,6 +624,10 @@ export async function runGatewayLoop(params: {

583624

}

584625

if (!server || !restartResolver) {

585626

pendingStartupRequest = acceptedRequest;

627+

void markRestartDraining().catch((err) => {

628+

gatewayLog.warn(`failed to mark gateway draining for startup restart: ${String(err)}`);

629+

});

630+

armPendingStartupForceExitTimer();

586631

return;

587632

}

588633

runAcceptedRequest(acceptedRequest);

@@ -668,6 +713,7 @@ export async function runGatewayLoop(params: {

668713

let isFirstStart = true;

669714

for (;;) {

670715

await onIteration();

716+

restartDrainingMarkPromise = null;

671717

let startupFailedBeforeServerHandle = false;

672718

try {

673719

server = await params.start({ startupStartedAt });