[fixed] issue with concurrent account fetch when account was incomplete #2067
Conversation
This file contains 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 happened when a dummy (expired/incomplete) account was created during a route operation. The dummy was to avoid fetching the account, which would cause a lock inversion. When a non route request required the account, we'd download it as it is set to expired. A concurrent request would result in ErrAccountResolverSameClaims which the caller did not handle. Fix is to remove ErrAccountResolverSameClaims. Signed-off-by: Matthias Hanel <mh@synadia.com>
derekcollison
approved these changes
Apr 6, 2021
server/server.go
Outdated
| @@ -1318,9 +1318,12 @@ func (s *Server) updateAccountWithClaimJWT(acc *Account, claimJWT string) error | |||
| if acc == nil { | |||
| return ErrMissingAccount | |||
| } | |||
| if acc.claimJWT != "" && acc.claimJWT == claimJWT && !acc.incomplete { | |||
| acc.mu.Lock() | |||
There was a problem hiding this comment.
I think this may be a RW lock.
kozlovic
approved these changes
Apr 6, 2021
server/server.go
Outdated
| @@ -1318,9 +1318,12 @@ func (s *Server) updateAccountWithClaimJWT(acc *Account, claimJWT string) error | |||
| if acc == nil { | |||
| return ErrMissingAccount | |||
| } | |||
| if acc.claimJWT != "" && acc.claimJWT == claimJWT && !acc.incomplete { | |||
| acc.mu.Lock() | |||
Signed-off-by: Matthias Hanel <mh@synadia.com>
Signed-off-by: Matthias Hanel <mh@synadia.com>
kozlovic
reviewed
Apr 6, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This happened when a dummy (expired/incomplete) account was created during
a route operation. The dummy was to avoid fetching the account, which would
cause a lock inversion.
When a non route request required the account, we'd download it as it is
set to expired.
A concurrent request would result in ErrAccountResolverSameClaims which
the caller did not handle.
Fix is to remove ErrAccountResolverSameClaims.
Signed-off-by: Matthias Hanel mh@synadia.com