set cache to nil to signal closed

Emyrk · Emyrk · commit 72f1b74a413f · 2025-06-20T10:56:53.000-05:00
diff --git a/coderd/files/closer.go b/coderd/files/closer.go
@@ -15,7 +15,6 @@ type CacheCloser struct {
 
 	closers []func()
 	mu      sync.Mutex
-	closed  bool
 }
 
 func NewCacheCloser(cache FileAcquirer) *CacheCloser {
@@ -32,8 +31,9 @@ func (c *CacheCloser) Close() {
 	for _, doClose := range c.closers {
 		doClose()
 	}
-	c.closed = true
 
+	// Prevent further acquisitions
+	c.cache = nil
 	// Remove any references
 	c.closers = make([]func(), 0)
 }
@@ -42,7 +42,7 @@ func (c *CacheCloser) Acquire(ctx context.Context, fileID uuid.UUID) (*CloseFS,
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	if c.closed {
+	if c.cache == nil {
 		return nil, xerrors.New("cache is closed, and cannot acquire new files")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ type CacheCloser struct {`
`15`	`15`
`16`	`16`	`closers []func()`
`17`	`17`	`mu sync.Mutex`
`18`		`- closed bool`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`func NewCacheCloser(cache FileAcquirer) *CacheCloser {`
`@@ -32,8 +31,9 @@ func (c *CacheCloser) Close() {`
`32`	`31`	`for _, doClose := range c.closers {`
`33`	`32`	`doClose()`
`34`	`33`	`}`
`35`		`- c.closed = true`
`36`	`34`
	`35`	`+ // Prevent further acquisitions`
	`36`	`+ c.cache = nil`
`37`	`37`	`// Remove any references`
`38`	`38`	`c.closers = make([]func(), 0)`
`39`	`39`	`}`
`@@ -42,7 +42,7 @@ func (c CacheCloser) Acquire(ctx context.Context, fileID uuid.UUID) (CloseFS,`
`42`	`42`	`c.mu.Lock()`
`43`	`43`	`defer c.mu.Unlock()`
`44`	`44`
`45`		`- if c.closed {`
	`45`	`+ if c.cache == nil {`
`46`	`46`	`return nil, xerrors.New("cache is closed, and cannot acquire new files")`
`47`	`47`	`}`
`48`	`48`