fix(gateway): report draining state in readiness (#94915)...

Recent Commits to openclaw:main

markoub · 2026-06-22 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ import {`
`53`	`53`	`pinActivePluginSessionExtensionRegistry,`
`54`	`54`	`} from "../plugins/runtime.js";`
`55`	`55`	`import type { PluginRuntime } from "../plugins/runtime/types.js";`
`56`		`-import { getTotalQueueSize } from "../process/command-queue.js";`
	`56`	`+import { getTotalQueueSize, isGatewayDraining } from "../process/command-queue.js";`
`57`	`57`	`import type { RuntimeEnv } from "../runtime.js";`
`58`	`58`	`import {`
`59`	`59`	`clearSecretsRuntimeSnapshot,`
`@@ -876,6 +876,7 @@ export async function startGatewayServer(`
`876`	`876`	`startedAt: serverStartedAt,`
`877`	`877`	`getStartupPending: isGatewayStartupPending,`
`878`	`878`	`getStartupPendingReason: () => startupPendingReason,`
	`879`	`+getGatewayDraining: isGatewayDraining,`
`879`	`880`	`getEventLoopHealth: readinessEventLoopHealth.snapshot,`
`880`	`881`	`shouldSkipChannelReadiness: () =>`
`881`	`882`	`isTruthyEnvValue(process.env.OPENCLAW_SKIP_CHANNELS) \|\|`

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ function createReadinessHarness(params: {`
`68`	`68`	`accounts?: Record<string, Partial<ChannelAccountSnapshot>>;`
`69`	`69`	`getStartupPending?: () => boolean;`
`70`	`70`	`getStartupPendingReason?: Parameters<typeof createReadinessChecker>[0]["getStartupPendingReason"];`
	`71`	`+getGatewayDraining?: Parameters<typeof createReadinessChecker>[0]["getGatewayDraining"];`
`71`	`72`	`getEventLoopHealth?: Parameters<typeof createReadinessChecker>[0]["getEventLoopHealth"];`
`72`	`73`	`shouldSkipChannelReadiness?: Parameters<`
`73`	`74`	`typeof createReadinessChecker`
`@@ -83,6 +84,7 @@ function createReadinessHarness(params: {`
`83`	`84`	`startedAt,`
`84`	`85`	`getStartupPending: params.getStartupPending,`
`85`	`86`	`getStartupPendingReason: params.getStartupPendingReason,`
	`87`	`+getGatewayDraining: params.getGatewayDraining,`
`86`	`88`	`getEventLoopHealth: params.getEventLoopHealth,`
`87`	`89`	`shouldSkipChannelReadiness: params.shouldSkipChannelReadiness,`
`88`	`90`	`cacheTtlMs: params.cacheTtlMs,`
`@@ -178,6 +180,35 @@ describe("createReadinessChecker", () => {`
`178`	`180`	`});`
`179`	`181`	`});`
`180`	`182`
	`183`	`+it("reports not ready while the gateway command queue is draining for restart", () => {`
	`184`	`+withReadinessClock(() => {`
	`185`	`+const { manager, readiness } = createReadinessHarness({`
	`186`	`+getGatewayDraining: () => true,`
	`187`	`+cacheTtlMs: 1_000,`
	`188`	`+});`
	`189`	`+`
	`190`	`+expect(readiness()).toEqual(failingSnapshot(["gateway-draining"]));`
	`191`	`+expect(manager.getRuntimeSnapshot).not.toHaveBeenCalled();`
	`192`	`+});`
	`193`	`+});`
	`194`	`+`
	`195`	`+it("does not cache gateway-draining readiness", () => {`
	`196`	`+withReadinessClock(() => {`
	`197`	`+let gatewayDraining = true;`
	`198`	`+const { manager, readiness } = createReadinessHarness({`
	`199`	`+getGatewayDraining: () => gatewayDraining,`
	`200`	`+cacheTtlMs: 1_000,`
	`201`	`+});`
	`202`	`+`
	`203`	`+expect(readiness()).toEqual(failingSnapshot(["gateway-draining"]));`
	`204`	`+expect(manager.getRuntimeSnapshot).not.toHaveBeenCalled();`
	`205`	`+`
	`206`	`+gatewayDraining = false;`
	`207`	`+expect(readiness()).toEqual(readySnapshot());`
	`208`	`+expect(manager.getRuntimeSnapshot).toHaveBeenCalledTimes(1);`
	`209`	`+});`
	`210`	`+});`
	`211`	`+`
`181`	`212`	`it("ignores disabled and unconfigured channels", () => {`
`182`	`213`	`withReadinessClock(() => {`
`183`	`214`	`const { readiness } = createReadinessHarness({`

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ export function createReadinessChecker(deps: {`
`42`	`42`	`startedAt: number;`
`43`	`43`	`getStartupPending?: () => boolean;`
`44`	`44`	`getStartupPendingReason?: () => string \| undefined;`
	`45`	`+getGatewayDraining?: () => boolean;`
`45`	`46`	`getEventLoopHealth?: () => GatewayEventLoopHealth \| undefined;`
`46`	`47`	`shouldSkipChannelReadiness?: () => boolean;`
`47`	`48`	`cacheTtlMs?: number;`
`@@ -61,6 +62,12 @@ export function createReadinessChecker(deps: {`
`61`	`62`	`deps.getEventLoopHealth,`
`62`	`63`	`);`
`63`	`64`	`}`
	`65`	`+if (deps.getGatewayDraining?.()) {`
	`66`	`+return withEventLoopHealth(`
	`67`	`+{ ready: false, failing: ["gateway-draining"], uptimeMs },`
	`68`	`+deps.getEventLoopHealth,`
	`69`	`+);`
	`70`	`+}`
`64`	`71`	`if (deps.shouldSkipChannelReadiness?.()) {`
`65`	`72`	`return withEventLoopHealth({ ready: true, failing: [], uptimeMs }, deps.getEventLoopHealth);`
`66`	`73`	`}`

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

推荐订阅源

Recent Commits to openclaw:main