fix: cpu contention on jwk reads + suppress duplicate jwk generation#3870
Merged
aeneasr merged 1 commit intoory:masterfrom Nov 4, 2024
Merged
fix: cpu contention on jwk reads + suppress duplicate jwk generation#3870aeneasr merged 1 commit intoory:masterfrom
aeneasr merged 1 commit intoory:masterfrom
Conversation
terev
changed the title
awill1988
reviewed
Nov 1, 2024
awill1988
reviewed
Nov 1, 2024
…te JWKs Previously each concurrent caller would need to lock a shared mutex when reading or writing a given JWK set. The read path now doesn't require locking a mutex at all and instead returns valid query results directly. The write path is now protected by a concurrency control mechanism (using x/sync/singleflight) to ensure only one JWK set is generated and persisted. Note: Duplicate JWK sets may still be improperly generated if running more than one Hydra instance in a high traffic environment.
terev
force-pushed
the
suppress-duplicate-jwk-gen
branch
from
378b42a to
c41c1ef
Compare
aeneasr
approved these changes
Nov 4, 2024
Member
|
Great job everyone, thanks! |
Contributor
Author
|
🎉 Thanks for the well written initial report @awill1988 ! |
Contributor
|
Awesome fix @terev! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Using the reproduction steps included in #3863 I'm able to confirm this fixes the read contention:
I also noticed the .well-known/jwks.json route generates extra keys (if hammered before initialized) so I changed that handler to utilize the same duplicate suppression code.
Related issue(s)
Closes #3863
Checklist
introduces a new feature.
contributing code guidelines.
vulnerability. If this pull request addresses a security vulnerability, I
confirm that I got the approval (please contact
[email protected]) from the maintainers to push
the changes.
works.
Further Comments