Backport of Always forward entity merge requests from perfStandby into release/1.15.x #24330
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
hc-github-team-secure-vault-core
force-pushed
the
backport/always-forward-entity-merge/firmly-classic-fly
branch
from
818455b
to
db43ec6
Compare
hc-github-team-secure-vault-core
force-pushed
the
backport/always-forward-entity-merge/firmly-classic-fly
branch
from
d4da529
to
4b80b5c
Compare
github-actions
bot
added
the
hashicorp-contributed-pr
mpalmi
approved these changes
Dec 1, 2023
|
Build Results: |
mpalmi
deleted the
backport/always-forward-entity-merge/firmly-classic-fly
branch
|
CI Results: |
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.
Backport
This PR is auto-generated from #24325 to be assessed for backporting due to the inclusion of the label backport/1.15.x.
The below text is copied from the body of the original PR.
Update requests to
/sys/identity/entity/mergeperform merges on perfStandby nodes in memory and skip the persist call.This PR changes the behavior for the merge endpoint, forcing it to be forwarded from the standby to the active node. This change is specifically scoped to manual merges, as automatic merges are not isolated to a specific endpoint and require careful consideration for all callers.
Tests are on Enterprise: https://github.com/hashicorp/vault-enterprise/pull/5008/files
Overview of commits