fix: avoid all queriers reserved for prioritized requests

damnever · damnever · commit 02c3ff131709 · 2025-10-17T10:58:09.000+08:00
Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>
diff --git a/pkg/scheduler/queue/user_queues.go b/pkg/scheduler/queue/user_queues.go
@@ -399,7 +399,7 @@ func getPriorityList(queryPriority validation.QueryPriority, totalQuerierCount i
 		}
 	}
 
-	if len(priorityList) > totalQuerierCount {
+	if len(priorityList) >= totalQuerierCount {
 		return []int64{}
 	}
 
diff --git a/pkg/scheduler/queue/user_queues_test.go b/pkg/scheduler/queue/user_queues_test.go
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ func getPriorityList(queryPriority validation.QueryPriority, totalQuerierCount i`
`399`	`399`	`}`
`400`	`400`	`}`
`401`	`401`
`402`		`- if len(priorityList) > totalQuerierCount {`
	`402`	`+ if len(priorityList) >= totalQuerierCount {`
`403`	`403`	`return []int64{}`
`404`	`404`	`}`
`405`	`405`
Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ func TestGetOrAddQueueShouldUpdateProperties(t *testing.T) {`
`427`	`427`	`limits.QueryPriorityVal = validation.QueryPriority{Enabled: true, Priorities: []validation.PriorityDef{`
`428`	`428`	`{`
`429`	`429`	`Priority: 1,`
`430`		`- ReservedQueriers: 10,`
	`430`	`+ ReservedQueriers: float64(q.userQueues["userID"].maxQueriers),`
`431`	`431`	`},`
`432`	`432`	`}}`
`433`	`433`	`q.limits = limits`