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.

Sign up for GitHub

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

Jump to bottom

Backport of VAULT-23926: Fix rollback deadlock on perf secondaries into release/1.14.x #25552

Merged
merged 1 commit into from
Feb 21, 2024
Merged

Backport of VAULT-23926: Fix rollback deadlock on perf secondaries into release/1.14.x #25552

merged 1 commit into from
Feb 21, 2024

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

This PR is auto-generated from #25448 to be assessed for backporting due to the inclusion of the label backport/1.14.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@miagilepner
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.

The test is in an enterprise PR.

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Feb 21, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Feb 21, 2024
@github-actions GitHub Actions
Copy link

CI Results:
All Go tests succeeded! ✅

@miagilepner
backport of commit 5f0638a (#25448)
0b5bed8 
* prevent deadlock

* rollbacks not done for sync invalidate

* add check for the path before deleting

* revert sync invalidation doesn't do rollbacks

* add known issue

* changelog

* fix formatting issue
@miagilepner miagilepner force-pushed the backport/miagilepner/VAULT-23926-rollback-deadlock/constantly-pet-giraffe branch from db09961 to 0b5bed8 Compare February 21, 2024 15:55
@miagilepner miagilepner added this to the 1.14.10 milestone Feb 21, 2024
@miagilepner miagilepner marked this pull request as ready for review February 21, 2024 15:55
@miagilepner miagilepner requested a review from a team as a code owner February 21, 2024 15:55
@github-actions GitHub Actions
Copy link

Build Results:
All builds succeeded! ✅

@miagilepner miagilepner merged commit d3028e6 into release/1.14.x Feb 21, 2024
86 of 95 checks passed
@miagilepner miagilepner deleted the backport/miagilepner/VAULT-23926-rollback-deadlock/constantly-pet-giraffe branch February 21, 2024 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miagilepner miagilepner miagilepner approved these changes

Assignees
No one assigned
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed
Projects
None yet
Milestone
1.14.10
Development

Successfully merging this pull request may close these issues.
3 participants
@hc-github-team-secure-vault-core @hashicorp-cla @miagilepner