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

Backport of Ignore errors from rollback manager invocations into release/1.12.x #22236

Conversation

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

Backport

This PR is auto-generated from #22235 to be assessed for backporting due to the inclusion of the label backport/1.12.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:
@cipherboy
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.


During reload and mount move operations, we want to ensure that errors created by the final Rollback are not fatal (which risk failing replication in Enterprise when the core/mounts table gets invalidated). This mirrors the behavior of the periodic rollback manager, which only logs the error.

This updates the noop backend to allow failing just rollback operations, which we can use in tests to verify this behavior and ensure the core operations (plugin reload, plugin move, and seal/unseal) are not broken by this. Note that most of these operations were asynchronous from the client's PoV and thus did not fail anyways prior to this change.

reg: VAULT-18857


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/cipherboy-log-not-err-on-rollback-failures/slightly-quick-gibbon branch from 4b8d478 to 03db5a1 Compare August 8, 2023 15:42
@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/cipherboy-log-not-err-on-rollback-failures/slightly-quick-gibbon branch from 03db5a1 to 4b8d478 Compare August 8, 2023 15:42
@hashicorp-cla
Copy link

hashicorp-cla commented Aug 8, 2023

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 Aug 8, 2023
@github-actions
Copy link

github-actions bot commented Aug 8, 2023

CI Results:
All Go tests succeeded! ✅

@cipherboy cipherboy self-assigned this Aug 16, 2023
* Ignore errors from rollback manager invocations

During reload and mount move operations, we want to ensure that errors
created by the final Rollback are not fatal (which risk failing
replication in Enterprise when the core/mounts table gets invalidated).
This mirrors the behavior of the periodic rollback manager, which
only logs the error.

This updates the noop backend to allow failing just rollback operations,
which we can use in tests to verify this behavior and ensure the core
operations (plugin reload, plugin move, and seal/unseal) are not broken
by this. Note that most of these operations were asynchronous from the
client's PoV and thus did not fail anyways prior to this change.

Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>

* Add changelog entry

Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>

* Update vault/external_tests/router/router_ext_test.go

Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>

---------

Signed-off-by: Alexander Scheel <alex.scheel@hashicorp.com>
Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>
@cipherboy cipherboy force-pushed the backport/cipherboy-log-not-err-on-rollback-failures/slightly-quick-gibbon branch from 5908615 to 08f0731 Compare August 16, 2023 17:16
@cipherboy cipherboy marked this pull request as ready for review August 16, 2023 17:16
@cipherboy cipherboy enabled auto-merge (squash) August 16, 2023 17:28
@cipherboy cipherboy merged commit 9cc2dfc into release/1.12.x Aug 16, 2023
85 of 86 checks passed
@github-actions
Copy link

Build Results:
All builds succeeded! ✅

@cipherboy cipherboy deleted the backport/cipherboy-log-not-err-on-rollback-failures/slightly-quick-gibbon branch August 16, 2023 17:30
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.

None yet

3 participants