-
Notifications
You must be signed in to change notification settings - Fork 4.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
identity (CE): Persist conflict resolution after rename #29471
Merged
Merged
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
CI Results: |
a5d0025
to
6ad4d93
Compare
This PR introduces a test which exercises Vault's renameResolver and asserts deterministic state after invalidation. To ensure that automatic de-duplication is consistent across all nodes, we detect the node's cluster status and persist renames IFF the node is active. The PR includes some modifications to deterministic reload testing, since they now have the side-effect of persistence on active nodes, as well as tests for consistency in the face of storagePacker bucket invalidation.
This commit introduces a random seed variable to be used with UUID generation in Identity Store determinism tests. The seed is automatically generated or passed during Environment Variable and displayed during test failure. This allows for easy reproduction of any test failures for later debugging.
25f4ef6
to
95b0db7
Compare
Build Results: |
biazmoreira
reviewed
Feb 5, 2025
biazmoreira
previously approved these changes
Feb 5, 2025
davidadeleon
previously approved these changes
Feb 5, 2025
biazmoreira
approved these changes
Feb 5, 2025
davidadeleon
approved these changes
Feb 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Description
This PR ensures that automatic de-duplication is consistent across all
nodes in an Enterprise cluster by persisting conflict resolution on the
active node.
This logic to prevents Enterprise clusters from accidentally reverting
any conflict resolution after it's performed.
The PR includes some modifications to deterministic reload testing,
since they now have the side-effect of persistence on active nodes, as
well as tests for consistency in the face of storagePacker bucket
invalidation.
Enterprise PR: https://github.com/hashicorp/vault-enterprise/pull/7343
Resolves: VAULT-33555, VAULT-33504
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.