From 1fc1581ff397d45354c92e3f05142530aa05bbe9 Mon Sep 17 00:00:00 2001 From: Erlan Zholdubai uulu Date: Fri, 29 Aug 2025 15:33:41 -0700 Subject: [PATCH] remove limiting query rejection to only adhoc queries for ingester. This shouldn't have been included as discussed in PR #6947 Signed-off-by: Erlan Zholdubai uulu --- pkg/ingester/ingester.go | 13 ++++++------- pkg/ingester/ingester_test.go | 8 -------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go index cda8e23f57b..c2dab4a54ec 100644 --- a/pkg/ingester/ingester.go +++ b/pkg/ingester/ingester.go @@ -63,7 +63,6 @@ import ( "github.com/cortexproject/cortex/pkg/util/limiter" logutil "github.com/cortexproject/cortex/pkg/util/log" util_math "github.com/cortexproject/cortex/pkg/util/math" - "github.com/cortexproject/cortex/pkg/util/requestmeta" "github.com/cortexproject/cortex/pkg/util/resource" "github.com/cortexproject/cortex/pkg/util/services" "github.com/cortexproject/cortex/pkg/util/spanlogger" @@ -1697,7 +1696,7 @@ func (i *Ingester) QueryExemplars(ctx context.Context, req *client.ExemplarQuery } // We will report *this* request in the error too. - c, err := i.trackInflightQueryRequest(ctx) + c, err := i.trackInflightQueryRequest() if err != nil { return nil, err } @@ -1805,7 +1804,7 @@ func (i *Ingester) labelsValuesCommon(ctx context.Context, req *client.LabelValu q.Close() } - c, err := i.trackInflightQueryRequest(ctx) + c, err := i.trackInflightQueryRequest() if err != nil { return nil, cleanup, err } @@ -1902,7 +1901,7 @@ func (i *Ingester) labelNamesCommon(ctx context.Context, req *client.LabelNamesR q.Close() } - c, err := i.trackInflightQueryRequest(ctx) + c, err := i.trackInflightQueryRequest() if err != nil { return nil, cleanup, err } @@ -2253,7 +2252,7 @@ func (i *Ingester) QueryStream(req *client.QueryRequest, stream client.Ingester_ return nil } -func (i *Ingester) trackInflightQueryRequest(ctx context.Context) (func(), error) { +func (i *Ingester) trackInflightQueryRequest() (func(), error) { gl := i.getInstanceLimits() if gl != nil && gl.MaxInflightQueryRequests > 0 { if i.inflightQueryRequests.Load() >= gl.MaxInflightQueryRequests { @@ -2263,7 +2262,7 @@ func (i *Ingester) trackInflightQueryRequest(ctx context.Context) (func(), error i.maxInflightQueryRequests.Track(i.inflightQueryRequests.Inc()) - if i.resourceBasedLimiter != nil && !requestmeta.RequestFromRuler(ctx) { + if i.resourceBasedLimiter != nil { if err := i.resourceBasedLimiter.AcceptNewRequest(); err != nil { level.Warn(i.logger).Log("msg", "failed to accept request", "err", err) return nil, httpgrpc.Errorf(http.StatusServiceUnavailable, "failed to query: %s", limiter.ErrResourceLimitReachedStr) @@ -2283,7 +2282,7 @@ func (i *Ingester) queryStreamChunks(ctx context.Context, db *userTSDB, from, th } defer q.Close() - c, err := i.trackInflightQueryRequest(ctx) + c, err := i.trackInflightQueryRequest() if err != nil { return 0, 0, 0, 0, err } diff --git a/pkg/ingester/ingester_test.go b/pkg/ingester/ingester_test.go index e5934ea9722..c59879a1d84 100644 --- a/pkg/ingester/ingester_test.go +++ b/pkg/ingester/ingester_test.go @@ -61,7 +61,6 @@ import ( "github.com/cortexproject/cortex/pkg/util" "github.com/cortexproject/cortex/pkg/util/chunkcompat" "github.com/cortexproject/cortex/pkg/util/limiter" - "github.com/cortexproject/cortex/pkg/util/requestmeta" "github.com/cortexproject/cortex/pkg/util/resource" "github.com/cortexproject/cortex/pkg/util/services" "github.com/cortexproject/cortex/pkg/util/test" @@ -3228,18 +3227,11 @@ func Test_Ingester_Query_ResourceThresholdBreached(t *testing.T) { } rreq := &client.QueryRequest{} - ctx = requestmeta.ContextWithRequestSource(ctx, requestmeta.SourceAPI) s := &mockQueryStreamServer{ctx: ctx} err = i.QueryStream(rreq, s) require.Error(t, err) exhaustedErr := limiter.ResourceLimitReachedError{} require.ErrorContains(t, err, exhaustedErr.Error()) - - // we shouldn't reject queries from ruler - ctx = requestmeta.ContextWithRequestSource(ctx, requestmeta.SourceRuler) - s = &mockQueryStreamServer{ctx: ctx} - err = i.QueryStream(rreq, s) - require.Nil(t, err) } func TestIngester_LabelValues_ShouldNotCreateTSDBIfDoesNotExists(t *testing.T) {