proper release gating

aslilac · aslilac · commit 610740a330de · 2025-06-24T22:48:45.000Z
diff --git a/coderd/files/cache.go b/coderd/files/cache.go
@@ -194,14 +194,20 @@ func (c *Cache) prepare(ctx context.Context, db database.Store, fileID uuid.UUID
 		hitLabel = "false"
 
 		var releaseOnce sync.Once
+		release := func() {
+			releaseOnce.Do(func() {
+				c.purge(fileID)
+			})
+		}
 		entry = &cacheEntry{
 			refCount: 0,
 			value: lazy.NewWithError(func() (CacheEntryValue, error) {
 				val, err := fetch(db, fileID)
 				if err != nil {
 					// Force future calls to Acquire to trigger a new fetch as soon as
 					// a fetch has failed, even if references are still held.
-					delete(c.data, fileID)
+					entry.close()
+					release()
 					return val, err
 				}
 
@@ -218,12 +224,11 @@ func (c *Cache) prepare(ctx context.Context, db database.Store, fileID uuid.UUID
 
 				entry.refCount--
 				c.currentOpenFileReferences.Dec()
-
-				if entry.refCount == 0 {
-					releaseOnce.Do(func() {
-						c.purge(fileID)
-					})
+				if entry.refCount > 0 {
+					return
 				}
+
+				release()
 			},
 		}
 		c.data[fileID] = entry
