From 717493da0a783336d19c611b30c78b86002b04be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8C=B2=20Harry=20=F0=9F=8C=8A=20John=20=F0=9F=8F=94?= Date: Fri, 6 Jan 2023 10:29:37 -0800 Subject: [PATCH] Bug fix: ingesters returning empty response MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 🌲 Harry 🌊 John 🏔 --- CHANGELOG.md | 1 + pkg/ingester/ingester.go | 2 +- pkg/ingester/ingester_test.go | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dac257f1a5a..693bddf87e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ * [BUGFIX] Fix panic when otel and xray tracing is enabled. #5044 * [BUGFIX] Fixed no compact block got grouped in shuffle sharding grouper. #5055 * [BUGFIX] Tracing: Fix missing object storage span instrumentation. #5074 +* [BUGFIX] Ingester: Ingesters returning empty response for metadata APIs. #5081 ## 1.14.0 2022-12-02 diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go index b8f8ac23456..35834885944 100644 --- a/pkg/ingester/ingester.go +++ b/pkg/ingester/ingester.go @@ -2572,7 +2572,7 @@ func metadataQueryRange(queryStart, queryEnd int64, db *userTSDB, queryStoreForL if queryIngestersWithin > 0 && queryStoreForLabels { // If the feature for querying metadata from store-gateway is enabled, // then we don't want to manipulate the mint and maxt. - return + return queryStart, queryEnd, nil } // Ingesters are run with limited retention and we don't support querying the store-gateway for labels yet. diff --git a/pkg/ingester/ingester_test.go b/pkg/ingester/ingester_test.go index 8ae139d9a98..4ab5f06c550 100644 --- a/pkg/ingester/ingester_test.go +++ b/pkg/ingester/ingester_test.go @@ -1797,14 +1797,16 @@ func Test_Ingester_MetricsForLabelMatchers(t *testing.T) { }, }, "should filter metrics by time range if queryStoreForLabels and queryIngestersWithin is enabled": { - from: 100, - to: 1000, + from: 99999, + to: 100001, matchers: []*client.LabelMatchers{{ Matchers: []*client.LabelMatcher{ {Type: client.EQUAL, Name: model.MetricNameLabel, Value: "test_1"}, }, }}, - expected: []*cortexpb.Metric{}, + expected: []*cortexpb.Metric{ + {Labels: cortexpb.FromLabelsToLabelAdapters(fixtures[0].lbls)}, + }, queryStoreForLabels: true, queryIngestersWithin: time.Hour, },