@@ -114,6 +114,7 @@ type cacheEntry struct {
114114value * lazy.ValueWithError [CacheEntryValue ]
115115
116116close func ()
117+ purge func ()
117118}
118119
119120type CacheEntryValue struct {
@@ -149,7 +150,8 @@ func (c *Cache) Acquire(ctx context.Context, db database.Store, fileID uuid.UUID
149150e := c .prepare (db ,fileID )
150151ev ,err := e .value .Load ()
151152if err != nil {
152- c .purge (fileID )
153+ e .close ()
154+ e .purge ()
153155return nil ,err
154156}
155157
@@ -193,9 +195,9 @@ func (c *Cache) prepare(db database.Store, fileID uuid.UUID) *cacheEntry {
193195if ! ok {
194196hitLabel = "false"
195197
196- var releaseOnce sync.Once
197- release := func () {
198- releaseOnce .Do (func () {
198+ var purgeOnce sync.Once
199+ purge := func () {
200+ purgeOnce .Do (func () {
199201c .purge (fileID )
200202})
201203}
@@ -204,10 +206,6 @@ func (c *Cache) prepare(db database.Store, fileID uuid.UUID) *cacheEntry {
204206value :lazy .NewWithError (func () (CacheEntryValue ,error ) {
205207val ,err := fetch (db ,fileID )
206208if err != nil {
207- // Force future calls to Acquire to trigger a new fetch as soon as
208- // a fetch has failed, even if references are still held.
209- entry .close ()
210- release ()
211209return val ,err
212210}
213211
@@ -228,8 +226,10 @@ func (c *Cache) prepare(db database.Store, fileID uuid.UUID) *cacheEntry {
228226return
229227}
230228
231- release ()
229+ purge ()
232230},
231+
232+ purge :purge ,
233233}
234234c .data [fileID ]= entry
235235
@@ -245,7 +245,8 @@ func (c *Cache) prepare(db database.Store, fileID uuid.UUID) *cacheEntry {
245245return entry
246246}
247247
248- // purge immediately removes an entry from the cache. It should be called
248+ // purge immediately removes an entry from the cache, even if it has open references.
249+ // It should only be called from the `close` function in a `cacheEntry`.
249250func (c * Cache )purge (fileID uuid.UUID ) {
250251c .lock .Lock ()
251252defer c .lock .Unlock ()