Skip to content

[BUGFIX] Ingester: fix inflight query counter leak on resource rejection #7539

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

Open
sandy2008 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[BUGFIX] Ingester: fix inflight query counter leak on resource rejection #7539

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92f7156
Fix ingester inflight query counter leak
sandy2008 May 22, 2026
b955dfa
Address review feedback on inflight query leak fix
sandy2008 May 22, 2026
7c3a47d
Merge branch 'master' into codex/fix-ingester-inflight-query-leak
friedrichg May 24, 2026
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 @@ -39,6 +39,7 @@
* [BUGFIX] Security: Fix stored XSS vulnerability in Alertmanager and Store Gateway status pages by replacing `text/template` with `html/template`. #7512
* [BUGFIX] Security: Limit decompressed gzip output in `ParseProtoReader` and OTLP ingestion path. The decompressed body is now capped by `-distributor.otlp-max-recv-msg-size`. #7515
* [BUGFIX] Tenant Federation: Fix regex resolver clearing known users list when user scan fails. #7534
* [BUGFIX] Ingester: Fix inflight query counter leak when resource-based query protection rejects a request. #7539

## 1.21.0 2026-04-24

Expand Down
4 changes: 2 additions & 2 deletions pkg/ingester/ingester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2515,15 +2515,15 @@ func (i *Ingester) trackInflightQueryRequest() (func(), error) {
}
}

i.maxInflightQueryRequests.Track(i.inflightQueryRequests.Inc())

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, limiter.ErrResourceLimitReached
}
}

i.maxInflightQueryRequests.Track(i.inflightQueryRequests.Inc())

return func() {
i.inflightQueryRequests.Dec()
}, nil
Expand Down
9 changes: 8 additions & 1 deletion pkg/ingester/ingester_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3533,7 +3533,9 @@ func Test_Ingester_Query_ResourceThresholdBreached(t *testing.T) {
{labels.FromStrings("__name__", "test_1", "route", "get_user", "status", "200"), 1, 100000},
}

i, err := prepareIngesterWithBlocksStorage(t, defaultIngesterTestConfig(t), prometheus.NewRegistry())
cfg := defaultIngesterTestConfig(t)
cfg.DefaultLimits.MaxInflightQueryRequests = 1
i, err := prepareIngesterWithBlocksStorage(t, cfg, prometheus.NewRegistry())
require.NoError(t, err)
require.NoError(t, services.StartAndAwaitRunning(context.Background(), i))
defer services.StopAndAwaitTerminated(context.Background(), i) //nolint:errcheck
Expand Down Expand Up @@ -3566,6 +3568,11 @@ func Test_Ingester_Query_ResourceThresholdBreached(t *testing.T) {

// Expected error from isRetryableError in blocks_store_queryable.go
require.ErrorIs(t, err, limiter.ErrResourceLimitReached)
require.Equal(t, int64(0), i.inflightQueryRequests.Load())

i.resourceBasedLimiter = nil
s = &mockQueryStreamServer{ctx: ctx}
require.NoError(t, i.QueryStream(rreq, s))
Comment thread
sandy2008 marked this conversation as resolved.
Outdated
}

func TestIngester_LabelValues_ShouldNotCreateTSDBIfDoesNotExists(t *testing.T) {
Expand Down
Loading