Fix unlocked mounts read #29091
Merged
Fix unlocked mounts read #29091
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
mpalmi
added
pr/no-changelog
pr/no-milestone
backport/ent/1.16.x+ent
github-actions
bot
added
the
hashicorp-contributed-pr
VioletHynes
reviewed
Dec 4, 2024
There was a problem hiding this comment.
This seems to miss the core_metrics change from https://github.com/hashicorp/vault-enterprise/pull/7083/files#diff-02f8615172474bd9e2da0f53c035171ab26c9f1351ded5c101aa19b0c4ace6a9
This PR fixes copy-paste error in the product usage code where we were taking out the authLock to access the mount table. While we're add it we can remove the existing lock grabbing in the product usage goroutine in favor of a serialized startup/teardown of censusManager and its core dependency which requires the lock. This requires some minor test edits, so created a test helper for that. By moving the censusManager teardown before expirationManager teardown, we can effectively ensure the goroutine is completely stopped outside of any expirationManager change. We are already guaranteed serial startup, so this should free us of any complex lock semantics.
mpalmi
force-pushed
the
serialize-censusManger-teardown
branch
from
73e4e4d to
032708b
Compare
|
Build Results: |
|
CI Results:
|
Good catch! It was a bad cherry-pick 🤦. I put the changelog for the bugfix in here as well now and editorialized the commit message a bit. |
VioletHynes
previously approved these changes
Dec 4, 2024
mpalmi
removed
backport/ent/1.16.x+ent
VioletHynes
approved these changes
Dec 4, 2024
6 tasks
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 commit enforces complete censusManager teardown prior to stopping the expiration manager, allowing us to simplify locking elsewhere in censusManager code.
We're now guaranteed to not have state change underneath us, since censusManager goroutine lifecycles are postUnseal -> preSeal.
Description
What does this PR do?
TODO only if you're a HashiCorp employee
backport/label that matches the desired release branch. Note that in the CE repo, the latest release branch will look likebackport/x.x.x, but older release branches will bebackport/ent/x.x.x+ent.of a public function, even if that change is in a CE file, double check that
applying the patch for this PR to the ENT repo and running tests doesn't
break any tests. Sometimes ENT only tests rely on public functions in CE
files.
in the PR description, commit message, or branch name.
description. Also, make sure the changelog is in this PR, not in your ENT PR.