fix(memory): clean rollback-journal reindex temp sidecar on NFS stores

Alix-007 · steipete · commit 018d2794687f · 2026-06-15T05:49:12.000-07:00
cleanupAgedMemoryReindexTempFiles only removed WAL sidecars (-wal/-shm) of orphaned reindex temp DBs. On NFS-backed stores configureMemorySqliteWalMaintenance -&gt; requireRollbackJournalMode forces journal_mode=DELETE, so the reindex temp DB uses a rollback journal; a hard crash leaves an orphaned .tmp-&lt;uuid&gt;-journal that leaked forever (cleanup neither deleted nor even discovered it). Add -journal to both the delete set (memoryIndexFileSuffixes) and the discovery set (reindexTempEntrySuffixes), with regression tests for the temp-plus-journal and stranded-journal cases.
diff --git a/extensions/memory-core/src/memory/manager-db-probe.test.ts b/extensions/memory-core/src/memory/manager-db-probe.test.ts
@@ -121,6 +121,54 @@ describe("openMemoryDatabaseAtPath readOnly probe", () => {
     await expectPathMissing(`${orphanBase}-shm`);
   });
 
+  it("removes aged orphan reindex temp files including the rollback-journal sidecar", async () => {
+    const dbPath = path.join(fixtureRoot, `case-${caseId++}`, "index.sqlite");
+    const dir = path.dirname(dbPath);
+    await fs.mkdir(dir, { recursive: true });
+    const seed = new DatabaseSync(dbPath);
+    seed.exec("CREATE TABLE IF NOT EXISTS meta(key TEXT PRIMARY KEY, value TEXT)");
+    seed.close();
+
+    // NFS-backed stores keep journal_mode=DELETE, so a hard crash during a
+    // reindex leaves a rollback-journal sidecar (.tmp-<uuid>-journal) rather
+    // than -wal/-shm. Cleanup must remove it alongside the temp main file.
+    const orphanBase = `${dbPath}.tmp-22222222-3333-4444-5555-666666666666`;
+    for (const suffix of ["", "-journal"]) {
+      const filePath = `${orphanBase}${suffix}`;
+      await fs.writeFile(filePath, "orphan");
+      const old = new Date(Date.now() - 48 * 60 * 60_000);
+      await fs.utimes(filePath, old, old);
+    }
+
+    const db = openMemoryDatabaseAtPath(dbPath, false);
+    db.close();
+
+    await expectPathMissing(orphanBase);
+    await expectPathMissing(`${orphanBase}-journal`);
+  });
+
+  it("removes a stranded rollback-journal sidecar whose temp main file is already gone", async () => {
+    const dbPath = path.join(fixtureRoot, `case-${caseId++}`, "index.sqlite");
+    const dir = path.dirname(dbPath);
+    await fs.mkdir(dir, { recursive: true });
+    const seed = new DatabaseSync(dbPath);
+    seed.exec("CREATE TABLE IF NOT EXISTS meta(key TEXT PRIMARY KEY, value TEXT)");
+    seed.close();
+
+    // Only the rollback journal survives (its temp main file was already
+    // removed). The discovery set must still recognize the orphan by its
+    // -journal suffix, otherwise it leaks forever.
+    const strandedJournal = `${dbPath}.tmp-33333333-4444-5555-6666-777777777777-journal`;
+    await fs.writeFile(strandedJournal, "stranded journal");
+    const old = new Date(Date.now() - 48 * 60 * 60_000);
+    await fs.utimes(strandedJournal, old, old);
+
+    const db = openMemoryDatabaseAtPath(dbPath, false);
+    db.close();
+
+    await expectPathMissing(strandedJournal);
+  });
+
   it("keeps young reindex temp files during live database startup", async () => {
     const dbPath = path.join(fixtureRoot, `case-${caseId++}`, "index.sqlite");
     const dir = path.dirname(dbPath);
diff --git a/extensions/memory-core/src/memory/manager-db.ts b/extensions/memory-core/src/memory/manager-db.ts
@@ -19,8 +19,8 @@ import {
 // own a young temp DB without losing its in-flight rebuild.
 const reindexTempFileWithoutLockMinAgeMs = 24 * 60 * 60_000;
 const reindexTempUuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
-const memoryIndexFileSuffixes = ["", "-wal", "-shm"] as const;
-const reindexTempEntrySuffixes = ["-wal", "-shm", ""] as const;
+const memoryIndexFileSuffixes = ["", "-wal", "-shm", "-journal"] as const;
+const reindexTempEntrySuffixes = ["-wal", "-shm", "-journal", ""] as const;
 
 function resolveReindexTempBaseName(dbBaseName: string, entryName: string): string | undefined {
   for (const suffix of reindexTempEntrySuffixes) {
