fix(server): preserve active VCS cache entries

Ben Davis committed 4 months ago

Commit 4a4df051 parent f891d522 files · +11 −2Browse files

Unified · Split

2 files

@@ -296,7 +296,7 @@ function enforceRetention(input: { · 295 unmodified lines
296	(left, right) => left.mtimeMs - right.mtimeMs \|\| left.filePath.localeCompare(right.filePath),	296	(left, right) => left.mtimeMs - right.mtimeMs \|\| left.filePath.localeCompare(right.filePath),
297	)) {	297	)) {
298	if (totalBytes <= input.maxTotalBytes) break;	298	if (totalBytes <= input.maxTotalBytes) break;
299	remove(file);	299	if (!remove(file)) break;
300	}	300	}
301		301
302	return { failures, removedCount, totalBytes };	302	return { failures, removedCount, totalBytes };

     Scope.close(scope, Exit.void),
   );
   const statusCache = new Map<string, CachedVcsStatus>();
+  const activeRemotePollerCwds = new Set<string>();
   const pollersRef = yield* SynchronizedRef.make(new Map<string, ActiveRemotePoller>());
   const setCachedStatus = (cwd: string, status: CachedVcsStatus) => {
     statusCache.set(cwd, status);
     while (statusCache.size > VCS_STATUS_CACHE_CAPACITY) {
-      const oldestCwd = statusCache.keys().next().value;
+      let oldestCwd: string | undefined;
+      for (const cachedCwd of statusCache.keys()) {
+        if (!activeRemotePollerCwds.has(cachedCwd)) {
+          oldestCwd = cachedCwd;
+          break;
+        }
+      }
       if (oldestCwd === undefined) {
         break;
       }
       return makeRemoteRefreshLoop(cwd, automaticRemoteRefreshInterval, refreshImmediately).pipe(
         Effect.forkIn(broadcasterScope),
         Effect.map((fiber) => {
+          activeRemotePollerCwds.add(cwd);
           const nextPollers = new Map(activePollers);
           nextPollers.set(cwd, {
             fiber,
         }
         return Effect.sync(() => {
+          activeRemotePollerCwds.delete(cwd);
           statusCache.delete(cwd);
           return [undefined, activePollers] as const;
         });