Prevent a deadlock in expiration #22374
Merged
+8
−1
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
…ding lock, while a revocationJob's OnFailure grabs those lock in the reverse order.
github-actions
bot
added
the
hashicorp-contributed-pr
|
CI Results:
|
ncabatoff
added
backport/1.12.x
backport/1.13.x
|
Build Results: |
jasonodonnell
approved these changes
Aug 16, 2023
VioletHynes
approved these changes
Aug 16, 2023
There was a problem hiding this comment.
I had a look through this code and I agree with this fix. This should prevent the pending lock being held while the individual lease's lock is being grabbed. In particular, this should prevent a deadlock when a lease is being expired and restored at the same time, as far as I understand it.
There's a chance we haven't gotten to the bottom of this, but based on my understanding, this should either fix the problem or make it much better.
This was referenced Aug 16, 2023
rebwill
pushed a commit
that referenced
this pull request
Aug 18, 2023
* Prevent a deadlock that occurs when Restore grabs lease lock then pending lock, while a revocationJob's OnFailure grabs those lock in the reverse order. * Fix lock * Add CL * Grab lock before markLeaseIrrevocable --------- Co-authored-by: hc-github-team-secure-vault-core <github-team-secure-vault-core@hashicorp.com>
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.
Deadlock occurs when Restore grabs lease lock then pending lock, while a revocationJob's OnFailure grabs those lock in the reverse order.