Fix scheduler deadlock when reducing max_outstanding_requests_per_tenant #7187
Conversation
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
This commit fixes a critical deadlock in the query scheduler that occurs when a tenant's max_outstanding_requests_per_tenant limit is dynamically reduced via runtime configuration. When MaxOutstandingPerTenant is reduced while a user's FIFORequestQueue is full, the getOrAddQueue method attempts to migrate requests to a smaller queue. Previously, this loop blocked indefinitely when the new queue capacity was reached, causing the scheduler to freeze. The fix ensures the migration loop breaks when the new queue is full, effectively dropping excess requests instead of blocking. Verification: Added regression test TestGetOrAddQueue_ShouldNotDeadlockWhenLimitsAreReduced Signed-off-by: Kishore K G <kishorekg@google.com>
…exproject#7179) * Update Ruler frontend_address comments to mention Store Gateway Signed-off-by: Kishore K G <kishorekg@google.com> * Update pkg/ruler/ruler.go Co-authored-by: SungJin1212 <tjdwls1201@gmail.com> Signed-off-by: kishorekg1999 <kishorekg.github@gmail.com> * Update Ruler frontend_address comments to mention Store Gateway Signed-off-by: Kishore K G <kishorekg@google.com> * empty commit Signed-off-by: Kishore K G <kishorekg@google.com> --------- Signed-off-by: Kishore K G <kishorekg@google.com> Signed-off-by: kishorekg1999 <kishorekg.github@gmail.com> Co-authored-by: SungJin1212 <tjdwls1201@gmail.com>
* Rename user index update config Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> * fix lint Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> --------- Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>
…d got logged and add performance logs for sharded block populator (cortexproject#7181) Signed-off-by: Alex Le <leqiyue@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
What this PR does:
This PR fixes a critical deadlock in the query scheduler that occurs when a tenant's max_outstanding_requests_per_tenant limit is dynamically reduced via runtime configuration.
When MaxOutstandingPerTenant is reduced while a user's FIFORequestQueue is full, the getOrAddQueue method attempts to migrate requests to a smaller queue. Previously, this loop blocked indefinitely when the new queue capacity was reached, causing the scheduler to freeze.
The fix ensures the migration loop breaks when the new queue is full, effectively dropping excess requests instead of blocking.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]