diff --git a/docs/operations/browser-file-storage-recovery.md b/docs/operations/browser-file-storage-recovery.md index 81765b77..d7ace2c2 100644 --- a/docs/operations/browser-file-storage-recovery.md +++ b/docs/operations/browser-file-storage-recovery.md @@ -433,7 +433,9 @@ VD-15 목표 runtime을 먼저 구현한다. journal이나 staging receipt가 참조하는 chunk는 이때도 지우지 않는다. report의 `chunkSweep`이 `COMPLETED`여야 bytes가 지워진 것이다. `DEADLINE_REACHED`면 같은 purge를 다시 호출하고, `STAGING_STATE_UNREADABLE`이면 읽을 수 없는 staging부터 - 처리한다 + 처리한다. 다른 탭이 바꾸고 있던 객체를 지우지 못하면 report는 + `moreObjectsAvailable: true`이고 `chunkSweep`이 없다. 이때도 같은 purge를 다시 + 호출한다([0929] 05-02) - lock/worker 문제면 OPFS write off → approved capped fallback 또는 online-only - scope binding mismatch면 affected scope를 read-only로 격리하고 registry/ composition을 forward fix; 다른 token path로 bytes를 이동하거나 추측 복구 금지 diff --git a/src/adapters/storage/opfs/opfs-byte-store-adapter.ts b/src/adapters/storage/opfs/opfs-byte-store-adapter.ts index 2390325a..1f590f52 100644 --- a/src/adapters/storage/opfs/opfs-byte-store-adapter.ts +++ b/src/adapters/storage/opfs/opfs-byte-store-adapter.ts @@ -819,6 +819,11 @@ export function createOpfsByteStoreAdapter( }); if (!removed.ok) { if (removed.error.code === "CONFLICT" || removed.error.code === "NOT_FOUND") { + // [0929] 05-02. Another context changed this object, so it may + // still be here: report more work and skip the chunk sweep. No + // later assignment clears this — the page-advance one below only + // runs when the page had more objects, and PRESSURE never sweeps. + moreObjectsAvailable = true; continue; } return rebaseFailure(removed.error, "OBJECT_RECONCILE"); diff --git a/src/application/ports/browser-file-storage/opfs-ports.ts b/src/application/ports/browser-file-storage/opfs-ports.ts index b0971694..5893d8a0 100644 --- a/src/application/ports/browser-file-storage/opfs-ports.ts +++ b/src/application/ports/browser-file-storage/opfs-ports.ts @@ -131,6 +131,11 @@ export type OpfsPolicyMaintenanceReport = Readonly<{ inspectedObjects: number; removedObjects: number; releasedBytes: number; + /** + * Objects may remain. It is also `true` when another context changed an + * object this run had to remove, which left that object in place + * ([0929] 05-02). + */ moreObjectsAvailable: boolean; deadlineReached: boolean; /** diff --git a/tests/unit/opfs-worker-runtime.test.ts b/tests/unit/opfs-worker-runtime.test.ts index 3899f8e3..8aba8732 100644 --- a/tests/unit/opfs-worker-runtime.test.ts +++ b/tests/unit/opfs-worker-runtime.test.ts @@ -2397,6 +2397,47 @@ describe("05-04 a LOGOUT or ACCOUNT_DELETION purge leaves no partition bytes beh bytes: [5], }); }); + + // [0929] 05-02. Another tab overwrites the object the purge is removing, so + // the purge's remove ends in CONFLICT. That purge is not finished and must + // not claim a completed chunk sweep. + it("reports a purge that skipped a changing object as unfinished", async () => { + const { root, tab } = sharedRootTabs(); + const purger = tab("p", authority); + const writer = tab("w", authority); + expect(await putBytes(purger, "object_secret_1", [1, 2, 3])).toMatchObject({ ok: true }); + const stalled = stalledSource(); + const overwrite = writer.objects.put({ + objectId: "object_secret_1", + expectedGeneration: 1, + mediaType: "application/octet-stream", + source: stalled.source, + }); + await stalled.streaming; + const purge = purger.maintenance.enforcePolicies({ reason: "ACCOUNT_DELETION" }); + await new Promise((resolve) => setTimeout(resolve, 20)); + stalled.release(); + + expect(await overwrite).toMatchObject({ ok: true }); + const first = await purge; + expect(first).toMatchObject({ + ok: true, + value: { inspectedObjects: 1, removedObjects: 0, moreObjectsAvailable: true }, + }); + expect(first.ok && first.value.chunkSweep).toBeUndefined(); + + expect( + await purger.maintenance.enforcePolicies({ reason: "ACCOUNT_DELETION" }), + ).toMatchObject({ + ok: true, + value: { + removedObjects: 1, + moreObjectsAvailable: false, + chunkSweep: "COMPLETED", + }, + }); + expect(filesUnder(root, scopeA)).toEqual([]); + }); }); describe("05-07 a put whose source stops lets go of the origin lock", () => {