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 Only use the short persistKeyring timeout for encryption count tracking into release/1.13.x #24362

Conversation

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

Backport

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

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


The recently introduced short timeout to prevent slow HSMs causing trouble while persisting barrier encryptions was also affecting more important code paths. This changes that timeout to only be applied on encryption count persists.


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/sgm/selective-keyring-timeout/strangely-intent-peacock branch 2 times, most recently from ed957fd to c43e081 Compare December 4, 2023 22:38
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Dec 4, 2023
@sgmiller sgmiller enabled auto-merge (squash) December 4, 2023 22:39
@sgmiller sgmiller added this to the 1.13.12 milestone Dec 4, 2023
Copy link

github-actions bot commented Dec 4, 2023

Build Results:
All builds succeeded! ✅

@sgmiller sgmiller merged commit 79f170d into release/1.13.x Dec 4, 2023
95 of 97 checks passed
@sgmiller sgmiller deleted the backport/sgm/selective-keyring-timeout/strangely-intent-peacock branch December 4, 2023 22:58
Copy link

github-actions bot commented Dec 4, 2023

CI Results:
All Go tests succeeded! ✅

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