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

Don't exit just because we think there was a possible deadlock #21342

Merged
merged 2 commits into from
Jun 19, 2023

Conversation

ncabatoff
Copy link
Collaborator

Fixes #21338

Copy link
Contributor

@VioletHynes VioletHynes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me, we don't want to be crashing Vault for users because of potential deadlocks.

I'm not too sure how we could write an elegant test for this behaviour, since we'd need to wait for 30s, but this is something that our existing tests missed. It's something we should think about adding some kinds of tests for, at least.

Copy link
Member

@banks banks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I attempted to verify that this probably does what we expect I didn't test manually but based on reading the source code for the library it does indeed seem to be the change we want.

I think this looks like a less risky position to take for now. We can decide later based on occurences of the log messages whether it would be better to allow users to opt in/out of the crash behaviour and/or modify the timeout.

Copy link
Member

@banks banks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forgot to approve

@ncabatoff ncabatoff added this to the 1.11.12 milestone Jun 19, 2023
@ncabatoff
Copy link
Collaborator Author

Manual 1.11 backport: #21350
Manual 1.12 backport: #21349

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

POTENTIAL DEADLOCK: When the rate limit quotas setup takes more time to load the quota config and rules
3 participants