chore: use database in current context for file cache #18490
Merged
+62
−63
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jun 23, 2025
This stack of pull requests is managed by Graphite. Learn more about stacking. |
353f193 to
2a37b9b
Compare
2a37b9b to
a33fad3
Compare
635c56b to
b7985e3
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR updates the file cache implementation to use the current database context when acquiring files, thereby preventing potential deadlocks when running in a transaction. Key changes include:
- Updating the Acquire method signatures in files/closer.go, files/cache.go, and related files to accept an explicit database.Store parameter.
- Modifying tests in cache_test.go and other parts of the code to use the updated Acquire method.
- Removing the deprecated NewFromStore constructor and switching to the new New constructor in coderd/coderd.go.
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| coderd/files/closer.go | Updated Acquire method signature to include a database parameter. |
| coderd/files/cache_test.go | Adjusted test calls to use the new signature for Acquire. |
| coderd/files/cache.go | Changed Acquire and prepare functions to accept db, and moved fetch logic to a package-level func. |
| coderd/dynamicparameters/render.go | Updated Acquire calls with db parameter for template and module file acquisition. |
| coderd/coderd.go | Replaced the deprecated NewFromStore with the new New constructor for FileCache. |
Comments suppressed due to low confidence (1)
coderd/files/cache.go:140
- Update the function documentation to reflect the addition of the db parameter and explain its role in avoiding deadlocks by providing the current database context.
func (c *Cache) Acquire(ctx context.Context, db database.Store, fileID uuid.UUID) (*CloseFS, error) {
b7985e3 to
467aca3
Compare
a33fad3 to
9245e87
Compare
This was referenced Jun 23, 2025
aslilac
approved these changes
Jun 23, 2025
Using the db.Store when in a TX causes a deadlock for dbmem. In production, this can cause a deadlock if at the current conn pool limit.
9245e87 to
7349e1f
Compare
467aca3 to
659b787
Compare
043cd58 to
37c71f1
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using the db.Store when in a TX causes a deadlock for dbmem.
In production, this can cause a deadlock if at the current conn pool
limit.
Example: