Skip to content

fix: avoid all queriers reserved for prioritized requests #7057

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 24, 2025
+25 −11
Merged

fix: avoid all queriers reserved for prioritized requests #7057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
* [BUGFIX] Runtime-config: Change to check tenant limit validation when loading runtime config only for `all`, `distributor`, `querier`, and `ruler` targets. #6880
* [BUGFIX] Distributor: Fix the `/distributor/all_user_stats` api to work during rolling updates on ingesters. #7026
* [BUGFIX] Runtime-config: Fix panic when the runtime config is `null`. #7062
* [BUGFIX] Scheduler: Avoid all queriers reserved for prioritized requests. #7057

## 1.19.1 2025-09-20

Expand Down
24 changes: 16 additions & 8 deletions pkg/scheduler/queue/queue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,8 @@ func TestReservedQueriersShouldOnlyGetHighPriorityQueries(t *testing.T) {
ctx := context.Background()

queue.RegisterQuerierConnection("querier-1")
queue.RegisterQuerierConnection("querier-2")
maxQueriers := float64(2)

normalRequest := MockRequest{
id: "normal query",
Expand All @@ -315,14 +317,20 @@ func TestReservedQueriersShouldOnlyGetHighPriorityQueries(t *testing.T) {
priority: 1,
}

assert.NoError(t, queue.EnqueueRequest("userID", normalRequest, 1, func() {}))
assert.NoError(t, queue.EnqueueRequest("userID", priority1Request, 1, func() {}))
assert.NoError(t, queue.EnqueueRequest("userID", priority1Request, 1, func() {}))
assert.NoError(t, queue.EnqueueRequest("userID", normalRequest, maxQueriers, func() {}))
assert.NoError(t, queue.EnqueueRequest("userID", priority1Request, maxQueriers, func() {}))
assert.NoError(t, queue.EnqueueRequest("userID", priority1Request, maxQueriers, func() {}))
reservedQueriers := queue.queues.userQueues["userID"].reservedQueriers
require.Equal(t, 1, len(reservedQueriers))
reservedQuerier := ""
for qid := range reservedQueriers {
reservedQuerier = qid
}

nextRequest, _, _ := queue.GetNextRequestForQuerier(ctx, FirstUser(), "querier-1")
nextRequest, _, _ := queue.GetNextRequestForQuerier(ctx, FirstUser(), reservedQuerier)
assert.Equal(t, priority1Request, nextRequest)

nextRequest, _, _ = queue.GetNextRequestForQuerier(ctx, FirstUser(), "querier-1")
nextRequest, _, _ = queue.GetNextRequestForQuerier(ctx, FirstUser(), reservedQuerier)
assert.Equal(t, priority1Request, nextRequest)

ctxTimeout, cancel := context.WithTimeout(ctx, 1*time.Second)
Expand All @@ -331,19 +339,19 @@ func TestReservedQueriersShouldOnlyGetHighPriorityQueries(t *testing.T) {
time.AfterFunc(2*time.Second, func() {
queue.cond.Broadcast()
})
nextRequest, _, _ = queue.GetNextRequestForQuerier(ctxTimeout, FirstUser(), "querier-1")
nextRequest, _, _ = queue.GetNextRequestForQuerier(ctxTimeout, FirstUser(), reservedQuerier)
assert.Nil(t, nextRequest)
assert.Equal(t, 1, queue.queues.userQueues["userID"].queue.length())

assert.NoError(t, queue.EnqueueRequest("userID", normalRequest, 1, func() {}))
assert.NoError(t, queue.EnqueueRequest("userID", normalRequest, maxQueriers, func() {}))

ctxTimeout, cancel = context.WithTimeout(ctx, 1*time.Second)
defer cancel()

time.AfterFunc(2*time.Second, func() {
queue.cond.Broadcast()
})
nextRequest, _, _ = queue.GetNextRequestForQuerier(ctxTimeout, FirstUser(), "querier-1")
nextRequest, _, _ = queue.GetNextRequestForQuerier(ctxTimeout, FirstUser(), reservedQuerier)
assert.Nil(t, nextRequest)
assert.Equal(t, 2, queue.queues.userQueues["userID"].queue.length())
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/scheduler/queue/user_queues.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ func getPriorityList(queryPriority validation.QueryPriority, totalQuerierCount i
}
}

if len(priorityList) > totalQuerierCount {
if len(priorityList) >= totalQuerierCount {
return []int64{}
}

Expand Down
9 changes: 7 additions & 2 deletions pkg/scheduler/queue/user_queues_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ func TestGetOrAddQueueShouldUpdateProperties(t *testing.T) {
limits.QueryPriorityVal = validation.QueryPriority{Enabled: true, Priorities: []validation.PriorityDef{
{
Priority: 1,
ReservedQueriers: 10,
ReservedQueriers: float64(q.userQueues["userID"].maxQueriers),
},
}}
q.limits = limits
Expand Down Expand Up @@ -674,9 +674,14 @@ func TestGetPriorityList(t *testing.T) {
assert.EqualValues(t, []int64{1, 1, 2, 2, 2}, getPriorityList(queryPriority, 10))
assert.EqualValues(t, []int64{}, getPriorityList(queryPriority, 1))

queryPriority.Priorities[0].ReservedQueriers = 0.3
queryPriority.Priorities[1].ReservedQueriers = 0.6
assert.EqualValues(t, []int64{1, 1, 1, 2, 2, 2, 2, 2, 2}, getPriorityList(queryPriority, 10))

// Cannot reserve all queriers for prioritized requests, remote read and metadata queries also need capacity.
queryPriority.Priorities[0].ReservedQueriers = 0.4
queryPriority.Priorities[1].ReservedQueriers = 0.6
assert.EqualValues(t, []int64{1, 1, 1, 1, 2, 2, 2, 2, 2, 2}, getPriorityList(queryPriority, 10))
assert.EqualValues(t, []int64{}, getPriorityList(queryPriority, 10))

queryPriority.Enabled = false
assert.Nil(t, getPriorityList(queryPriority, 10))
Expand Down
Loading