fix(coderd/cryptokeys): relock mutex to avoid double unlock #16802
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
spikecurtis
approved these changes
Mar 4, 2025
coderd/cryptokeys/cache.go
Outdated
| @@ -255,6 +255,7 @@ func (c *cache) cryptoKey(ctx context.Context, sequence int32) (string, []byte, | |||
|
|
|||
| keys, err := c.cryptoKeys(ctx) | |||
| if err != nil { | |||
| c.mu.Lock() // Re-lock because of defer. | |||
There was a problem hiding this comment.
I think it's clearer to move the Lock call from L262 up like:
c.mu.Unlock()
keys, err := c.cryptoKeys(ctx)
c.mu.Lock()
if err != nil {
return "", nil, xerrors.Errorf("get keys: %w", err)
}
That way it's clear that we are unlocking just for the c.cryptoKeys() call.
sreya
approved these changes
Mar 4, 2025
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.
Seen here https://github.com/coder/coder/actions/runs/13656406701/job/38176647915?pr=16801