fix(gateway): un-claim budget-overflow messages stuck in processing
getPendingMessagesByConversation() flips every fetched pending row to 'processing', then pickBatchWithinBudget() may stop early on the token budget. The tail rows that did NOT make the batch were never un-claimed, so they stayed 'processing' forever — the recovery worker reverted them (120s) only for the next wave to re-claim them, an infinite loop of stuck messages that never get analyzed (saw 22 rows, some recycled for 40+ minutes). - add computeBudgetOverflowMessages() pure helper (batchBudget.ts) - batchScheduler un-claims overflow rows back to 'pending' before dispatching the trimmed batch - recovery-worker now reverts stuck processing unconditionally (the old 'conversationProcessing.size > 0' guard skipped the revert when the in-memory lock map was empty, e.g. fresh boot — exactly when stranded rows from a previous process need rescuing) - 3 regression tests for the overflow helper
This commit is contained in:
1 parent
ef7708bf7d
commit
80daa9f045
4 files changed
+148
-14
No files matched your search
@@ -1,5 +1,6 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import {
|
||||
computeBudgetOverflowMessages,
|
||||
pickBatchWithinBudget,
|
||||
type TokenEstimator,
|
||||
} from "../src/modules/ai-moderation/batchBudget.js";
|
||||
@@ -10,6 +11,8 @@ import type { MessageRecord } from "../src/modules/message-capture/types.js";
|
||||
// the call site — see batchProcessor.ts).
|
||||
const estimate: TokenEstimator = (text: string) => text.length;
|
||||
|
||||
const TOKENS_PER_MESSAGE = 50;
|
||||
|
||||
function msg(id: string, content: string, createdAt: number): MessageRecord {
|
||||
return {
|
||||
id,
|
||||
@@ -36,8 +39,6 @@ function msg(id: string, content: string, createdAt: number): MessageRecord {
|
||||
}
|
||||
|
||||
describe("pickBatchWithinBudget", () => {
|
||||
const TOKENS_PER_MESSAGE = 50;
|
||||
|
||||
it("returns a contiguous chronological prefix — no gaps mid-timeline", () => {
|
||||
// sizes: 100, 100, 400 (overflow), 10
|
||||
const messages = [
|
||||
@@ -89,3 +90,59 @@ describe("pickBatchWithinBudget", () => {
|
||||
).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("computeBudgetOverflowMessages", () => {
|
||||
it("returns the tail that did NOT fit the token budget", () => {
|
||||
const messages = [
|
||||
msg("m1", "a".repeat(100), 1),
|
||||
msg("m2", "b".repeat(100), 2),
|
||||
msg("m3", "c".repeat(900), 3),
|
||||
msg("m4", "d".repeat(10), 4),
|
||||
];
|
||||
// 500 budget: m1(150)+m2(150)=300 fits, m3(950) overflows → batch = [m1,m2]
|
||||
const batch = pickBatchWithinBudget(
|
||||
messages,
|
||||
500,
|
||||
TOKENS_PER_MESSAGE,
|
||||
estimate,
|
||||
);
|
||||
const overflow = computeBudgetOverflowMessages(messages, batch);
|
||||
// m3 + m4 were claimed `processing` by the DB fetch but never processed —
|
||||
// they must be identified so the scheduler can return them to `pending`.
|
||||
expect(overflow.map((m) => m.id)).toEqual(["m3", "m4"]);
|
||||
});
|
||||
|
||||
it("returns everything when the batch is empty (all overflow)", () => {
|
||||
const messages = [
|
||||
msg("m1", "x".repeat(1000), 1),
|
||||
msg("m2", "y".repeat(1000), 2),
|
||||
];
|
||||
const batch = pickBatchWithinBudget(
|
||||
messages,
|
||||
500,
|
||||
TOKENS_PER_MESSAGE,
|
||||
estimate,
|
||||
);
|
||||
expect(batch).toHaveLength(0);
|
||||
expect(
|
||||
computeBudgetOverflowMessages(messages, batch).map((m) => m.id),
|
||||
).toEqual(["m1", "m2"]);
|
||||
});
|
||||
|
||||
it("returns nothing when every claimed message was processed", () => {
|
||||
const messages = [
|
||||
msg("m1", "a".repeat(100), 1),
|
||||
msg("m2", "b".repeat(100), 2),
|
||||
];
|
||||
const batch = pickBatchWithinBudget(
|
||||
messages,
|
||||
500,
|
||||
TOKENS_PER_MESSAGE,
|
||||
estimate,
|
||||
);
|
||||
expect(batch).toHaveLength(2);
|
||||
expect(
|
||||
computeBudgetOverflowMessages(messages, batch).map((m) => m.id),
|
||||
).toEqual([]);
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user