mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-11-18 07:58:27 +00:00
sse: close the provider breaker when a connection probe succeeds
chat.ts opens the provider-level breaker by name, but the combo success path only recorded the success against the connection-scoped breaker. A probe that returned 200 left the provider breaker HALF_OPEN, so the next request was rejected before dispatch. Signed-off-by: Minxi Hou <houminxi@gmail.com>
This commit is contained in:
@@ -1303,13 +1303,13 @@ export function recordProviderSuccess(
|
||||
// recordProviderCooldown which increments it on each failure.
|
||||
resetCooldownFailureCount(provider, connectionId ?? undefined);
|
||||
|
||||
// Clear failure-dedup window so the next genuine failure is not suppressed.
|
||||
if (connectionId) {
|
||||
lastConnectionFailure.delete(`${provider}:${connectionId}`);
|
||||
const providerBreaker = getProviderBreaker(provider);
|
||||
if (providerBreaker && providerBreaker !== breaker && providerBreaker.canExecute()) {
|
||||
providerBreaker._onSuccess();
|
||||
}
|
||||
}
|
||||
|
||||
// Transition breaker on success, matching execute()'s behavior:
|
||||
// HALF_OPEN -> CLOSED (probe success), CLOSED/DEGRADED -> decay failureCount.
|
||||
breaker._onSuccess();
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
/**
|
||||
* A provider-level breaker opened by chat.ts:_onFailure must close when the
|
||||
* combo success path records a success against a specific connection.
|
||||
*
|
||||
* Live failure: claude's provider breaker stayed HALF_OPEN after a probe
|
||||
* returned 200, because recordProviderSuccess(provider, connectionId) only
|
||||
* touched the connection-scoped breaker. The next request was rejected as
|
||||
* "all targets were skipped by pre-dispatch filters".
|
||||
*/
|
||||
import { test } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import {
|
||||
getCircuitBreaker,
|
||||
resetAllCircuitBreakers,
|
||||
} from "../../src/shared/utils/circuitBreaker.ts";
|
||||
import { recordProviderSuccess } from "../../open-sse/services/accountFallback.ts";
|
||||
import { connectionCircuitBreakerName } from "../../open-sse/services/connectionCircuitBreaker.ts";
|
||||
|
||||
const unique = (suffix: string) =>
|
||||
`provider-close-${suffix}-${Date.now()}-${Math.floor(Math.random() * 1e6)}`;
|
||||
|
||||
test("a connection-scoped success also closes the provider-level breaker", async () => {
|
||||
const provider = unique("both");
|
||||
const connectionId = "conn-1";
|
||||
|
||||
const providerBreaker = getCircuitBreaker(provider, {
|
||||
failureThreshold: 1,
|
||||
resetTimeout: 80,
|
||||
});
|
||||
providerBreaker._onFailure();
|
||||
assert.equal(providerBreaker.state, "OPEN");
|
||||
|
||||
const connectionBreaker = getCircuitBreaker(
|
||||
connectionCircuitBreakerName(provider, connectionId),
|
||||
{ failureThreshold: 1, resetTimeout: 80 }
|
||||
);
|
||||
connectionBreaker._onFailure();
|
||||
assert.equal(connectionBreaker.state, "OPEN");
|
||||
|
||||
await new Promise((r) => setTimeout(r, 120));
|
||||
providerBreaker.canExecute();
|
||||
connectionBreaker.canExecute();
|
||||
assert.equal(providerBreaker.state, "HALF_OPEN");
|
||||
assert.equal(connectionBreaker.state, "HALF_OPEN");
|
||||
|
||||
recordProviderSuccess(provider, connectionId);
|
||||
|
||||
assert.equal(providerBreaker.state, "CLOSED", "provider breaker must close");
|
||||
assert.equal(connectionBreaker.state, "CLOSED", "connection breaker must close");
|
||||
|
||||
resetAllCircuitBreakers();
|
||||
});
|
||||
Reference in New Issue
Block a user