diff --git a/gitnexus/src/core/lbug/pool-adapter.ts b/gitnexus/src/core/lbug/pool-adapter.ts index 8e9291d08..cedc5ae45 100644 --- a/gitnexus/src/core/lbug/pool-adapter.ts +++ b/gitnexus/src/core/lbug/pool-adapter.ts @@ -444,6 +444,11 @@ async function closeOne(repoId: string): Promise { } } + // Close yields on native db.close() above. A pinRepo during that await + // would otherwise survive teardown and apply to the next init, contradicting + // the documented lease contract (pins do not outlive closeOne). + pinnedRepos.delete(repoId); + traceRss('close', repoId); } @@ -937,6 +942,14 @@ export async function initLbugWithDb( repoId: string, existingDb: lbug.Database, dbPath: string, +): Promise { + return withPoolLock(() => initLbugWithDbInner(repoId, existingDb, dbPath)); +} + +async function initLbugWithDbInner( + repoId: string, + existingDb: lbug.Database, + dbPath: string, ): Promise { const existing = pool.get(repoId); if (existing) { diff --git a/gitnexus/test/unit/lbug-pool-pinning.test.ts b/gitnexus/test/unit/lbug-pool-pinning.test.ts index 106456cb6..4b5b5ce24 100644 --- a/gitnexus/test/unit/lbug-pool-pinning.test.ts +++ b/gitnexus/test/unit/lbug-pool-pinning.test.ts @@ -73,8 +73,9 @@ vi.mock('../../src/core/lbug/sidecar-recovery.js', () => ({ statIfExists: vi.fn().mockResolvedValue(null), })); -const { initLbug, closeLbug, isLbugReady, pinRepo, unpinRepo } = +const { initLbug, initLbugWithDb, closeLbug, isLbugReady, pinRepo, unpinRepo } = await import('../../src/core/lbug/pool-adapter.js'); +const { createLbugDatabase } = await import('../../src/core/lbug/lbug-config.js'); const { initWikiDb, closeWikiDb, pinWikiDb } = await import('../../src/core/wiki/graph-queries.js'); describe('pool-adapter repo pinning (issue #2189)', () => { @@ -251,4 +252,49 @@ describe('pool-adapter repo pinning (issue #2189)', () => { await init('d-extra2'); expect(isLbugReady('d-shared')).toBe(false); }); + + it('a pin acquired while closeOne awaits db.close() does not survive teardown', async () => { + vi.mocked(createLbugDatabase).mockImplementationOnce(() => ({ + init: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockImplementation(async () => { + await new Promise((resolve) => setTimeout(resolve, 20)); + }), + })); + + await init('late-pin'); + const closing = closeLbug('late-pin'); + await Promise.resolve(); + pinRepo('late-pin'); + await closing; + expect(isLbugReady('late-pin')).toBe(false); + + await init('late-pin'); + for (let i = 1; i <= 5; i++) await init(`late-fresh-${i}`); + expect(isLbugReady('late-pin')).toBe(false); + }); + + it('initLbugWithDb waits for an in-flight closeOne before registering', async () => { + vi.mocked(createLbugDatabase).mockImplementationOnce(() => ({ + init: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockImplementation(async () => { + await new Promise((resolve) => setTimeout(resolve, 20)); + }), + })); + + await init('injected-overlap'); + const closing = closeLbug('injected-overlap'); + await Promise.resolve(); + const injected = { + init: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + }; + const injecting = initLbugWithDb( + 'injected-overlap', + injected as never, + dbPathFor('injected-overlap'), + ); + await closing; + await injecting; + expect(isLbugReady('injected-overlap')).toBe(true); + }); });