Skip to content
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

Always forward entity merge requests from perfStandby #24325

Merged
merged 4 commits into from
Dec 1, 2023

Conversation

mpalmi
Copy link
Contributor

@mpalmi mpalmi commented Dec 1, 2023

Update requests to /sys/identity/entity/merge perform 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

@mpalmi mpalmi requested a review from elliesterner December 1, 2023 13:12
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Dec 1, 2023
Copy link

github-actions bot commented Dec 1, 2023

CI Results:
All Go tests succeeded! ✅

@mpalmi mpalmi marked this pull request as ready for review December 1, 2023 14:08
@mpalmi mpalmi requested a review from a team December 1, 2023 14:19
Copy link

github-actions bot commented Dec 1, 2023

Build Results:
All builds succeeded! ✅

@mpalmi mpalmi added this to the 1.13.12 milestone Dec 1, 2023
@mpalmi mpalmi enabled auto-merge (squash) December 1, 2023 14:31
@mpalmi mpalmi merged commit 4a7bee5 into main Dec 1, 2023
115 of 119 checks passed
@mpalmi mpalmi deleted the always-forward-entity-merge branch December 1, 2023 14:47
elliesterner pushed a commit that referenced this pull request Dec 1, 2023
Update requests to /sys/identity/entity/merge perform merges on perfStandby nodes in memory and skip the persist call.

This commit 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants