Fix test

Signed-off-by: Justin Jung <[email protected]>

Author: justinjung04

pkg/scheduler/queue/queue.go

@@ -2,6 +2,7 @@ package queue
 
 import (
 	"context"
+	"fmt"
 	"sync"
 	"time"
 
@@ -108,6 +109,7 @@ func (q *RequestQueue) EnqueueRequest(userID string, req Request, maxQueriers fl
 
 	q.totalRequests.WithLabelValues(userID).Inc()
 
+	fmt.Println("EnqueueRequest", q.queues.getTotalQueueSize(userID), maxOutstandingRequests)
 	if q.queues.getTotalQueueSize(userID) >= maxOutstandingRequests {
 		q.discardedRequests.WithLabelValues(userID).Inc()
 		return ErrTooManyRequests

pkg/scheduler/queue/queue_test.go

@@ -160,7 +160,7 @@ func TestRequestQueue_GetNextRequestForQuerier_ShouldGetRequestAfterReshardingBe
 }
 
 func TestRequestQueue_QueriersShouldGetHighPriorityQueryFirst(t *testing.T) {
-	queue := NewRequestQueue(3, 0,
+	queue := NewRequestQueue(100, 0,
 		prometheus.NewGaugeVec(prometheus.GaugeOpts{}, []string{"user"}),
 		prometheus.NewCounterVec(prometheus.CounterOpts{}, []string{"user"}),
 		MockLimits{MaxOutstanding: 3},
@@ -182,9 +182,9 @@ func TestRequestQueue_QueriersShouldGetHighPriorityQueryFirst(t *testing.T) {
 		isHighPriority: true,
 	}
 
-	assert.NotNil(t, queue.EnqueueRequest("userID", normalRequest1, 1, func() {}))
-	assert.NotNil(t, queue.EnqueueRequest("userID", normalRequest2, 1, func() {}))
-	assert.NotNil(t, queue.EnqueueRequest("userID", highPriorityRequest, 1, func() {}))
+	assert.Nil(t, queue.EnqueueRequest("userID", normalRequest1, 1, func() {}))
+	assert.Nil(t, queue.EnqueueRequest("userID", normalRequest2, 1, func() {}))
+	assert.Nil(t, queue.EnqueueRequest("userID", highPriorityRequest, 1, func() {}))
 
 	assert.Error(t, queue.EnqueueRequest("userID", highPriorityRequest, 1, func() {})) // should fail due to maxOutstandingPerTenant = 3
 	assert.Equal(t, 3, queue.queues.getTotalQueueSize("userID"))
@@ -197,7 +197,7 @@ func TestRequestQueue_QueriersShouldGetHighPriorityQueryFirst(t *testing.T) {
 }
 
 func TestRequestQueue_ReservedQueriersShouldOnlyGetHighPriorityQueries(t *testing.T) {
-	queue := NewRequestQueue(3, 0,
+	queue := NewRequestQueue(100, 0,
 		prometheus.NewGaugeVec(prometheus.GaugeOpts{}, []string{"user"}),
 		prometheus.NewCounterVec(prometheus.CounterOpts{}, []string{"user"}),
 		MockLimits{MaxOutstanding: 3, ReservedQueriers: 1},

pkg/scheduler/scheduler_test.go

@@ -37,7 +37,7 @@ func setupScheduler(t *testing.T, reg prometheus.Registerer) (*Scheduler, schedu
 	flagext.DefaultValues(&cfg)
 	cfg.MaxOutstandingPerTenant = testMaxOutstandingPerTenant
 
-	s, err := NewScheduler(cfg, frontendv1.MockLimits{Queriers: 2, MockLimits: queue.MockLimits{MaxOutstanding: 100}}, log.NewNopLogger(), reg)
+	s, err := NewScheduler(cfg, frontendv1.MockLimits{Queriers: 2, MockLimits: queue.MockLimits{MaxOutstanding: testMaxOutstandingPerTenant}}, log.NewNopLogger(), reg)
 	require.NoError(t, err)
 
 	server := grpc.NewServer()