Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(media-server): only sweep a legacy pid cache dir once its process is gone

Richie McIlroy620990e36e2f
diff --git a/apps/media-server/src/__tests__/lib/temp-files.test.ts b/apps/media-server/src/__tests__/lib/temp-files.test.ts
index b90263a2f..04c6b136c 100644
--- a/apps/media-server/src/__tests__/lib/temp-files.test.ts
+++ b/apps/media-server/src/__tests__/lib/temp-files.test.ts
@@ -155,22 +155,25 @@ describe("stale temp cleanup", () => {
});
describe("media transfer cache sweep", () => {
- test("removes orphaned instance and dead-pid cache dirs", async () => {
+ test("removes orphaned instance and dead-pid cache dirs but keeps a live pid's cache however old", async () => {
const base = join(tmpdir(), "cap-media-download-cache");
const staleInstance = join(base, `instance-${randomUUID()}`);
const liveInstance = join(base, `instance-${randomUUID()}`);
const exited = spawn({ cmd: ["true"] });
await exited.exited;
const deadPidDir = join(base, String(exited.pid));
+ const oldLivePidDir = join(base, String(process.ppid));
await makeTree(staleInstance, 10 * 60 * 1000, true);
await makeTree(liveInstance, 0, true);
await makeTree(deadPidDir, 0);
+ await makeTree(oldLivePidDir, 24 * 60 * 60 * 1000);
await sweepMediaTransferCache();
expect(existsSync(staleInstance)).toBe(false);
expect(existsSync(deadPidDir)).toBe(false);
expect(existsSync(liveInstance)).toBe(true);
+ expect(existsSync(oldLivePidDir)).toBe(true);
expect(existsSync(getInstanceDir(base))).toBe(false);
await cleanupMediaTransferCache();
});
diff --git a/apps/media-server/src/lib/media-transfer.ts b/apps/media-server/src/lib/media-transfer.ts
index e78829a12..a74cbc409 100644
--- a/apps/media-server/src/lib/media-transfer.ts
+++ b/apps/media-server/src/lib/media-transfer.ts
@@ -45,13 +45,14 @@ const cacheBase = join(tmpdir(), "cap-media-download-cache");
const cacheRoot = getInstanceDir(cacheBase);
const CACHE_BYTES = 2 * 1024 ** 3;
const CACHE_TTL_MS = 30 * 60_000;
-const LEGACY_CACHE_ORPHAN_AGE_MS = 60 * 60_000;
let cacheBytes = 0;
let lastPruneAt = 0;
-function isLegacyCacheOrphan(name: string, stats: { mtimeMs: number }) {
+// Pre-instance-dir caches are named after their owner's pid. Only remove one
+// once that process is confirmed gone; an old server sharing this volume during
+// a rolling deploy may still be reading from its cache.
+function isLegacyCacheOrphan(name: string) {
if (!/^\d+$/.test(name)) return false;
- if (Date.now() - stats.mtimeMs > LEGACY_CACHE_ORPHAN_AGE_MS) return true;
if (name === String(process.pid)) return false;
try {
process.kill(Number(name), 0);