Backport 1.5: fix deadlock on core state lock (#10456)#11250
Merged
Conversation
* fix race that can cause deadlock on core state lock The bug is in the grabLockOrStop function. For specific concurrent executions the grabLockOrStop function can return stopped=true when the lock is still held. A comment in grabLockOrStop indicates that the function is only used when the stateLock is held, but grabLockOrStop is being used to acquire the stateLock. If there are concurrent goroutines using grabLockOrStop then some concurrent executions result in stopped=true being returned when the lock is acquired. The fix is to add a lock and some state around which the parent and child goroutine in the grabLockOrStop function can coordinate so that the different concurrent executions can be handled. This change includes a non-deterministic unit test which reliably reproduces the problem before the fix. * use rand instead of time for random test stopCh close Using time.Now().UnixNano()%2 ends up being system dependent because different operating systems and hardware have different clock resolution. A lower resolution will return the same unix time for a longer period of time. It is better to avoid this issue by using a random number generator. This change uses the rand package default random number generator. It's generally good to avoid using the default random number generator, because it creates extra lock contention. For a test it should be fine.
|
This pull request is being automatically deployed with Vercel (learn more). vault – ./website🔍 Inspect: https://vercel.com/hashicorp/vault/8zZJnJwS6u112CtsRPPiy2eLEHHW [Deployment for 45d6e29 failed] vault-storybook – ./ui🔍 Inspect: https://vercel.com/hashicorp/vault-storybook/Ek82zAXPznCT7X51Pizu5Pfv17q8 [Deployment for 45d6e29 canceled] |
pull Bot
pushed a commit
to mayocream/vault
that referenced
this pull request
Dec 15, 2025
* replace Hds::Reveal with Hds::Accordion * adjust spacing to render in Hds::Form component * fix spacing in policy-example * cleanup form-section class usage * implement visual builder in create policy form * hide visual editor in search select modal * use general selectors, alphabetize form/field selectors * update test coverage to check for visual policy editor * reorganzie tests by module * add saving functionality for visual editor * refactor event handling methods * refactor component so parent manages stanzas * move snippets to automation-snippets tab component * polish up policy diff modal * refactor arg to be isCompact * update test coverage and export new component * rearrange methods to make diff easier * small cleanup, abc vars and remove unneeded change * add lanuage and update test coverage * update comment * fix form hierarchy * fix modal spacing; Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com>
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
2 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.
The bug is in the grabLockOrStop function. For specific concurrent
executions the grabLockOrStop function can return stopped=true when
the lock is still held. A comment in grabLockOrStop indicates that the
function is only used when the stateLock is held, but grabLockOrStop is
being used to acquire the stateLock. If there are concurrent goroutines
using grabLockOrStop then some concurrent executions result in
stopped=true being returned when the lock is acquired.
The fix is to add a lock and some state around which the parent and
child goroutine in the grabLockOrStop function can coordinate so that
the different concurrent executions can be handled.
This change includes a non-deterministic unit test which reliably
reproduces the problem before the fix.
Using time.Now().UnixNano()%2 ends up being system dependent because
different operating systems and hardware have different clock
resolution. A lower resolution will return the same unix time for a
longer period of time.
It is better to avoid this issue by using a random number generator.
This change uses the rand package default random number generator. It's
generally good to avoid using the default random number generator,
because it creates extra lock contention. For a test it should be fine.