[FIXED] Avoid deadlock in updateAccountClaimsWithRefresh#6726
Merged
neilalexander merged 2 commits intomainfrom Mar 27, 2025
Merged
[FIXED] Avoid deadlock in updateAccountClaimsWithRefresh#6726neilalexander merged 2 commits intomainfrom
neilalexander merged 2 commits intomainfrom
Conversation
Signed-off-by: Maurice van Veen <github@mauricevanveen.com> Co-authored-by: Neil Twigg <neil@nats.io>
Member
Author
|
The test is on the longer end in terms of runtime, roughly 30 seconds locally. Could move it to the long running tests, although those are primarily marked as JetStream cluster long running tests. |
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
kozlovic
approved these changes
Mar 25, 2025
Member
kozlovic
left a comment
kozlovic
left a comment
There was a problem hiding this comment.
I have checked the called functions and in none of them there is a case where we would lock the server, so using server lock here is ok. If there would be a need for getting the server lock somewhere in the stack, we would need a new mutex in the server object dedicated to this code (say updateClaimsMu).
Merged
wallyqs
changed the title
neilalexander
added a commit
that referenced
this pull request
Apr 17, 2025
Includes the following (already cherry-picked) PRs: - #6587 - #6607 - #6612 - #6609 - #6620 - #6668 - #6674 - #6647 - #6684 - #6691 - #6697 - #6705 - #6706 - #6704 - #6714 - #6720 - #6727 - #6730 - #6726 - #6732 - #6759 - #6753 - #6685 - #6769 - #6777 - #6785 - #6786 - #6778 - #6790 - #6791 - #6798 - #6794 - #6801 Signed-off-by: Neil Twigg <neil@nats.io> Signed-off-by: Neil Twigg <neil@nats.io>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Alternative fix for #6724, which could still deadlock.
Instead ensuring only one goroutine can go into this section in
updateAccountClaimsWithRefreshwhich ensures we can't deadlock due to grabbing two account locks in succession.Have placed the server lock before the range over the accounts, but it could optionally be moved to be around the
acc.mu.Lock/Unlockinstead.Signed-off-by: Maurice van Veen github@mauricevanveen.com
Co-authored-by: Neil Twigg neil@nats.io