mirror of
https://github.com/garrytan/gbrain.git
synced 2026-08-17 02:12:40 +00:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d98e6b507f | ||
|
|
d4bbf6eeae |
+1
-1
@@ -2387,7 +2387,7 @@ JOBS (Minions)
|
||||
jobs get <id> Job details + history
|
||||
jobs cancel <id> Cancel job
|
||||
jobs retry <id> Re-queue failed/dead job
|
||||
jobs prune [--older-than 30d] [--status s,..] Clean old terminal jobs (0d = no age floor)
|
||||
jobs prune [--older-than 30d] Clean old jobs
|
||||
jobs stats Job health dashboard
|
||||
jobs work [--queue Q] Start worker daemon (Postgres only)
|
||||
|
||||
|
||||
+5
-33
@@ -106,21 +106,6 @@ export function parseMaxRssFlag(args: string[]): number | undefined {
|
||||
return parsed;
|
||||
}
|
||||
|
||||
/** Terminal statuses `jobs prune --status` accepts (PR #2282). Matches what
|
||||
* queue.prune can safely delete; anything else (waiting/active/…) is live. */
|
||||
export const PRUNE_STATUSES = ['completed', 'failed', 'dead', 'cancelled'] as const satisfies readonly MinionJobStatus[];
|
||||
|
||||
/** Parse a `--status a,b,c` value into prune statuses. Throws on any value
|
||||
* outside PRUNE_STATUSES (fail-fast, mirrors parseNiceValue). */
|
||||
export function parsePruneStatuses(raw: string): MinionJobStatus[] {
|
||||
const requested = raw.split(',').map(s => s.trim()).filter(Boolean);
|
||||
const invalid = requested.filter(s => !(PRUNE_STATUSES as readonly string[]).includes(s));
|
||||
if (requested.length === 0 || invalid.length > 0) {
|
||||
throw new Error(`--status accepts a comma-separated subset of [${PRUNE_STATUSES.join(', ')}]${invalid.length ? `. Invalid: ${invalid.join(', ')}` : ''}`);
|
||||
}
|
||||
return requested as MinionJobStatus[];
|
||||
}
|
||||
|
||||
/** Parse `--nice N` (then `GBRAIN_NICE` env). Returns:
|
||||
* - undefined if absent (no priority change — inherit)
|
||||
* - the validated integer in [-20, 19] otherwise
|
||||
@@ -223,9 +208,7 @@ USAGE
|
||||
gbrain jobs get <id>
|
||||
gbrain jobs cancel <id>
|
||||
gbrain jobs retry <id>
|
||||
gbrain jobs prune [--older-than 30d] [--status completed,failed,dead,cancelled]
|
||||
(--older-than 0d = no age floor: deletes ALL
|
||||
matching terminal jobs; pair with --status)
|
||||
gbrain jobs prune [--older-than 30d]
|
||||
gbrain jobs delete <id>
|
||||
gbrain jobs stats
|
||||
gbrain jobs smoke
|
||||
@@ -617,27 +600,16 @@ HANDLER TYPES (built in)
|
||||
case 'prune': {
|
||||
const olderThanStr = parseFlag(args, '--older-than') ?? '30d';
|
||||
const days = parseInt(olderThanStr, 10);
|
||||
if (isNaN(days) || days < 0) {
|
||||
console.error('Error: --older-than must be a non-negative number (days). Example: --older-than 30d; --older-than 0d removes the age floor (deletes ALL matching terminal jobs).');
|
||||
if (isNaN(days) || days <= 0) {
|
||||
console.error('Error: --older-than must be a positive number (days). Example: --older-than 30d');
|
||||
process.exit(1);
|
||||
}
|
||||
const statusFlag = parseFlag(args, '--status');
|
||||
let statuses: MinionJobStatus[] | undefined;
|
||||
if (statusFlag !== undefined) {
|
||||
try { statuses = parsePruneStatuses(statusFlag); }
|
||||
catch (e) { console.error(`Error: ${e instanceof Error ? e.message : String(e)}`); process.exit(1); }
|
||||
}
|
||||
|
||||
try { await queue.ensureSchema(); }
|
||||
catch (e) { console.error(e instanceof Error ? e.message : String(e)); process.exit(1); }
|
||||
|
||||
const count = await queue.prune({
|
||||
olderThan: new Date(Date.now() - days * 86400000),
|
||||
...(statuses ? { status: statuses } : {}),
|
||||
});
|
||||
const statusLabel = statuses ? statuses.join('+') : 'completed+dead+cancelled';
|
||||
const ageLabel = days === 0 ? 'regardless of age' : `older than ${days} days`;
|
||||
console.log(`Pruned ${count} ${statusLabel} jobs ${ageLabel}.`);
|
||||
const count = await queue.prune({ olderThan: new Date(Date.now() - days * 86400000) });
|
||||
console.log(`Pruned ${count} jobs older than ${days} days.`);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -5565,30 +5565,78 @@ export class PostgresEngine implements BrainEngine {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* perf (#1694 by @Omerbahari): process-lifetime config cache. A single
|
||||
* search fires ~85 getConfig() reads (loadConfigWithEngine x2, plus
|
||||
* mode/cache/intent/rerank/graph-signals resolvers). On a remote pooler
|
||||
* each read is a round-trip; serial they dominate query latency and can
|
||||
* push the op handler past cli.ts's 10s disconnect force-exit, truncating
|
||||
* stdout. First read batch-loads the whole `config` table into this Map
|
||||
* (inside the same connRetry posture as the per-key read — #1603/#1891);
|
||||
* setConfig/unsetConfig write through. TTL bounds staleness for
|
||||
* multi-writer processes; GBRAIN_CONFIG_CACHE_TTL_MS=0 disables.
|
||||
* Only present keys are stored — Map.has() distinguishes known-absent.
|
||||
*/
|
||||
private _configCache: Map<string, string> | null = null;
|
||||
private _configCacheLoadedAt = 0;
|
||||
private _configCacheLoad: Promise<void> | null = null;
|
||||
private get _configCacheTtlMs(): number {
|
||||
const raw = process.env.GBRAIN_CONFIG_CACHE_TTL_MS;
|
||||
if (raw !== undefined) {
|
||||
const n = parseInt(raw, 10);
|
||||
if (Number.isFinite(n) && n >= 0) return n;
|
||||
}
|
||||
return 30_000;
|
||||
}
|
||||
|
||||
async getConfig(key: string): Promise<string | null> {
|
||||
// #1603: a transient pooler drop on this read used to throw / fall through
|
||||
// to defaults silently — which on remote Postgres surfaces as the wrong
|
||||
// search mode/knobs and empty-stdout queries.
|
||||
return this.connRetry(async () => {
|
||||
const rows = await this.sql`SELECT value FROM config WHERE key = ${key}`;
|
||||
return rows.length > 0 ? (rows[0].value as string) : null;
|
||||
});
|
||||
// search mode/knobs and empty-stdout queries. Both the batch load and the
|
||||
// cache-off per-key read keep the connRetry reconnect posture.
|
||||
const ttl = this._configCacheTtlMs;
|
||||
if (ttl === 0) {
|
||||
return this.connRetry(async () => {
|
||||
const rows = await this.sql`SELECT value FROM config WHERE key = ${key}`;
|
||||
return rows.length > 0 ? (rows[0].value as string) : null;
|
||||
});
|
||||
}
|
||||
if (this._configCache === null || Date.now() - this._configCacheLoadedAt >= ttl) {
|
||||
// Single-flight: concurrent cold reads share one batch load.
|
||||
this._configCacheLoad ??= this.connRetry(async () => {
|
||||
const rows = await this.sql`SELECT key, value FROM config` as unknown as
|
||||
Array<{ key: string; value: string | null }>;
|
||||
const map = new Map<string, string>();
|
||||
for (const r of rows) if (r.value != null) map.set(r.key, r.value);
|
||||
this._configCache = map;
|
||||
this._configCacheLoadedAt = Date.now();
|
||||
}).finally(() => {
|
||||
this._configCacheLoad = null;
|
||||
});
|
||||
await this._configCacheLoad;
|
||||
}
|
||||
return this._configCache!.has(key) ? this._configCache!.get(key)! : null;
|
||||
}
|
||||
|
||||
async setConfig(key: string, value: string): Promise<void> {
|
||||
return this.connRetry(async () => {
|
||||
await this.connRetry(async () => {
|
||||
await this.sql`
|
||||
INSERT INTO config (key, value) VALUES (${key}, ${value})
|
||||
ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value
|
||||
`;
|
||||
});
|
||||
// Write-through so a long-lived process never serves stale config.
|
||||
this._configCache?.set(key, value);
|
||||
}
|
||||
|
||||
async unsetConfig(key: string): Promise<number> {
|
||||
return this.connRetry(async () => {
|
||||
const count = await this.connRetry(async () => {
|
||||
const result = await this.sql`DELETE FROM config WHERE key = ${key}` as unknown as { count: number };
|
||||
return result.count ?? 0;
|
||||
});
|
||||
// Write-through: known-absent, so the cache doesn't serve a stale value.
|
||||
this._configCache?.delete(key);
|
||||
return count;
|
||||
}
|
||||
|
||||
async listConfigKeys(prefix: string): Promise<string[]> {
|
||||
|
||||
@@ -29,6 +29,13 @@ if (existsSync(envPath)) {
|
||||
}
|
||||
}
|
||||
|
||||
// E2E suites seed/rewrite the config table via raw SQL and expect engine
|
||||
// reads to see it immediately; disable the process-lifetime config cache
|
||||
// (#1694) so read semantics match pre-cache behavior. Spawned CLI
|
||||
// subprocesses inherit this. Cache semantics are pinned by
|
||||
// test/postgres-engine-config-cache.test.ts.
|
||||
process.env.GBRAIN_CONFIG_CACHE_TTL_MS ??= '0';
|
||||
|
||||
const DATABASE_URL = process.env.DATABASE_URL;
|
||||
const FIXTURES_DIR = resolve(import.meta.dir, 'fixtures');
|
||||
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
/**
|
||||
* Unit tests for parsePruneStatuses (PR #2282) — `jobs prune --status` parsing.
|
||||
*/
|
||||
|
||||
import { describe, test, expect } from 'bun:test';
|
||||
import { parsePruneStatuses, PRUNE_STATUSES } from '../src/commands/jobs.ts';
|
||||
|
||||
describe('parsePruneStatuses', () => {
|
||||
test('parses a single status', () => {
|
||||
expect(parsePruneStatuses('failed')).toEqual(['failed']);
|
||||
});
|
||||
|
||||
test('parses a comma-separated list with whitespace', () => {
|
||||
expect(parsePruneStatuses(' completed, dead ')).toEqual(['completed', 'dead']);
|
||||
});
|
||||
|
||||
test('accepts every documented terminal status', () => {
|
||||
expect(parsePruneStatuses(PRUNE_STATUSES.join(','))).toEqual([...PRUNE_STATUSES]);
|
||||
});
|
||||
|
||||
test('throws on non-terminal statuses', () => {
|
||||
expect(() => parsePruneStatuses('waiting')).toThrow(/Invalid: waiting/);
|
||||
expect(() => parsePruneStatuses('completed,active')).toThrow(/Invalid: active/);
|
||||
});
|
||||
|
||||
test('throws on empty value', () => {
|
||||
expect(() => parsePruneStatuses('')).toThrow(/comma-separated subset/);
|
||||
expect(() => parsePruneStatuses(',')).toThrow(/comma-separated subset/);
|
||||
});
|
||||
});
|
||||
@@ -702,32 +702,6 @@ describe('MinionQueue: Prune', () => {
|
||||
const count = await queue.prune({ olderThan: new Date(Date.now() + 86400000) }); // future date = prune everything old enough
|
||||
expect(count).toBe(1); // only the cancelled one
|
||||
});
|
||||
|
||||
// PR #2282: `jobs prune --status` passes an explicit status subset through.
|
||||
test('status filter prunes only the requested terminal statuses', async () => {
|
||||
const cancelled = await queue.add('sync', {});
|
||||
await queue.cancelJob(cancelled.id);
|
||||
const dead = await queue.add('embed', {}, { max_attempts: 1 });
|
||||
await queue.claim('tok1', 30000, 'default', ['embed']);
|
||||
await queue.failJob(dead.id, 'tok1', 'boom', 'dead');
|
||||
|
||||
const count = await queue.prune({ olderThan: new Date(Date.now() + 86400000), status: ['dead'] });
|
||||
expect(count).toBe(1); // only the dead one
|
||||
|
||||
const remaining = await queue.getJobs({ status: 'cancelled' });
|
||||
expect(remaining.length).toBe(1);
|
||||
});
|
||||
|
||||
// PR #2282: `--older-than 0d` = no age floor — olderThan of "now" deletes
|
||||
// terminal jobs that finished moments ago.
|
||||
test('olderThan now (0d semantics) prunes just-terminated jobs', async () => {
|
||||
const job = await queue.add('sync', {});
|
||||
await queue.cancelJob(job.id);
|
||||
await new Promise(r => setTimeout(r, 5)); // ensure updated_at < now
|
||||
|
||||
const count = await queue.prune({ olderThan: new Date() });
|
||||
expect(count).toBe(1);
|
||||
});
|
||||
});
|
||||
|
||||
// --- Stats (1 test) ---
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
/**
|
||||
* Process-lifetime config cache (#1694 takeover, by @Omerbahari).
|
||||
*
|
||||
* A single search fires ~85 getConfig() reads; on a remote pooler each is a
|
||||
* round-trip. The first read now batch-loads the whole `config` table into a
|
||||
* Map; setConfig/unsetConfig write through; TTL bounds multi-writer
|
||||
* staleness; GBRAIN_CONFIG_CACHE_TTL_MS=0 restores per-key reads.
|
||||
*
|
||||
* Pure: stubs `_sql` with a call-counting fake; no real DB.
|
||||
*/
|
||||
|
||||
import { describe, it, expect } from 'bun:test';
|
||||
import { PostgresEngine } from '../src/core/postgres-engine.ts';
|
||||
import { withEnv } from './helpers/with-env.ts';
|
||||
|
||||
const FAST_RETRY = { maxRetries: 3, delayMs: 1, delayMaxMs: 1, jitter: 'none' as const };
|
||||
|
||||
/** Engine whose `sql` records every query's template strings and returns `rows`. */
|
||||
function makeEngine(rows: unknown[]) {
|
||||
const e = new PostgresEngine();
|
||||
const calls: string[] = [];
|
||||
(e as unknown as { _connectionStyle: string })._connectionStyle = 'instance';
|
||||
(e as unknown as { _bulkRetryOptsCache: unknown })._bulkRetryOptsCache = FAST_RETRY;
|
||||
(e as unknown as { _sql: unknown })._sql = (strings: TemplateStringsArray) => {
|
||||
calls.push(strings.join('?'));
|
||||
return Promise.resolve(rows);
|
||||
};
|
||||
return { engine: e, calls };
|
||||
}
|
||||
|
||||
/** Run `fn` with GBRAIN_CONFIG_CACHE_TTL_MS set (or cleared when undefined). */
|
||||
const withTtl = (ttl: string | undefined, fn: () => Promise<void>) =>
|
||||
withEnv({ GBRAIN_CONFIG_CACHE_TTL_MS: ttl }, fn);
|
||||
|
||||
describe('PostgresEngine config cache (#1694)', () => {
|
||||
it('batch-loads once and serves repeat reads from the cache', () => withTtl(undefined, async () => {
|
||||
const { engine, calls } = makeEngine([
|
||||
{ key: 'search.mode', value: 'balanced' },
|
||||
{ key: 'embedding_multimodal', value: 'true' },
|
||||
]);
|
||||
expect(await engine.getConfig('search.mode')).toBe('balanced');
|
||||
expect(await engine.getConfig('embedding_multimodal')).toBe('true');
|
||||
expect(await engine.getConfig('search.mode')).toBe('balanced');
|
||||
// One SELECT total — this is the whole point of the fix.
|
||||
expect(calls.length).toBe(1);
|
||||
expect(calls[0]).toContain('SELECT key, value FROM config');
|
||||
}));
|
||||
|
||||
it('returns null for a known-absent key without an extra round-trip', () => withTtl(undefined, async () => {
|
||||
const { engine, calls } = makeEngine([{ key: 'a', value: '1' }]);
|
||||
expect(await engine.getConfig('missing.key')).toBeNull();
|
||||
expect(await engine.getConfig('missing.key')).toBeNull();
|
||||
expect(calls.length).toBe(1);
|
||||
}));
|
||||
|
||||
it('setConfig writes through so subsequent reads see the new value', () => withTtl(undefined, async () => {
|
||||
const { engine, calls } = makeEngine([{ key: 'k', value: 'old' }]);
|
||||
expect(await engine.getConfig('k')).toBe('old');
|
||||
await engine.setConfig('k', 'new');
|
||||
expect(await engine.getConfig('k')).toBe('new');
|
||||
expect(calls.length).toBe(2); // batch load + upsert; no re-read
|
||||
}));
|
||||
|
||||
it('unsetConfig writes through so subsequent reads see absence', () => withTtl(undefined, async () => {
|
||||
const { engine } = makeEngine([{ key: 'k', value: 'v' }]);
|
||||
expect(await engine.getConfig('k')).toBe('v');
|
||||
await engine.unsetConfig('k');
|
||||
expect(await engine.getConfig('k')).toBeNull();
|
||||
}));
|
||||
|
||||
it('concurrent cold reads share a single batch load (single-flight)', () => withTtl(undefined, async () => {
|
||||
const { engine, calls } = makeEngine([{ key: 'k', value: 'v' }]);
|
||||
const [a, b, c] = await Promise.all([
|
||||
engine.getConfig('k'),
|
||||
engine.getConfig('k'),
|
||||
engine.getConfig('other'),
|
||||
]);
|
||||
expect([a, b, c]).toEqual(['v', 'v', null]);
|
||||
expect(calls.length).toBe(1);
|
||||
}));
|
||||
|
||||
it('GBRAIN_CONFIG_CACHE_TTL_MS=0 disables the cache (per-key reads)', () => withTtl('0', async () => {
|
||||
const { engine, calls } = makeEngine([{ value: 'v' }]);
|
||||
expect(await engine.getConfig('k')).toBe('v');
|
||||
expect(await engine.getConfig('k')).toBe('v');
|
||||
expect(calls.length).toBe(2);
|
||||
expect(calls[0]).toContain('SELECT value FROM config WHERE key =');
|
||||
}));
|
||||
|
||||
it('an expired TTL reloads from the database', () => withTtl('1', async () => {
|
||||
const { engine, calls } = makeEngine([{ key: 'k', value: 'v' }]);
|
||||
expect(await engine.getConfig('k')).toBe('v');
|
||||
await new Promise((r) => setTimeout(r, 5));
|
||||
expect(await engine.getConfig('k')).toBe('v');
|
||||
expect(calls.length).toBe(2); // two batch loads
|
||||
}));
|
||||
|
||||
it('the batch load keeps the connRetry reconnect posture (#1603/#1891)', () => withTtl(undefined, async () => {
|
||||
const e = new PostgresEngine();
|
||||
(e as unknown as { _connectionStyle: string })._connectionStyle = 'instance';
|
||||
(e as unknown as { _sql: unknown })._sql = null; // torn-down pool → retryable
|
||||
(e as unknown as { _bulkRetryOptsCache: unknown })._bulkRetryOptsCache = FAST_RETRY;
|
||||
let reconnects = 0;
|
||||
(e as unknown as { reconnect: () => Promise<void> }).reconnect = async () => {
|
||||
reconnects++;
|
||||
(e as unknown as { _sql: unknown })._sql = () =>
|
||||
Promise.resolve([{ key: 'k', value: 'v' }]);
|
||||
};
|
||||
expect(await e.getConfig('k')).toBe('v');
|
||||
expect(reconnects).toBe(1);
|
||||
}));
|
||||
});
|
||||
@@ -43,7 +43,9 @@ function makeTornDownEngine(poolResult: unknown): { engine: PostgresEngine; reco
|
||||
|
||||
describe('PostgresEngine non-batch config accessors self-heal (PR #1891 takeover)', () => {
|
||||
it('getConfig reconnects + retries a null instance pool, then returns the value', async () => {
|
||||
const { engine, reconnects } = makeTornDownEngine([{ value: 'live-value' }]);
|
||||
// Rows carry `key` too: getConfig's default cached path batch-loads
|
||||
// `SELECT key, value FROM config` (#1694) through the same connRetry.
|
||||
const { engine, reconnects } = makeTornDownEngine([{ key: 'some.key', value: 'live-value' }]);
|
||||
expect(await engine.getConfig('some.key')).toBe('live-value');
|
||||
expect(reconnects()).toBe(1); // exactly one reconnect closed the gap
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user