Fix root cause of nil return in queryWithRetry and labelsWithRetry#7375
Merged
friedrichg merged 2 commits intomasterfrom Mar 28, 2026
Merged
Fix root cause of nil return in queryWithRetry and labelsWithRetry#7375friedrichg merged 2 commits intomasterfrom
friedrichg merged 2 commits intomasterfrom
Conversation
When ingesterQueryMaxAttempts > 1 and the context is cancelled before the backoff loop starts, retries.Ongoing() returns false immediately and the loop never executes, causing both retry functions to return (nil, nil). This propagates ctx.Err() from the retry functions themselves so all callers are protected, and removes the caller-side nil guard added in #7369. Also aligns the early-return check in labelsWithRetry to use <= 1 consistently with queryWithRetry. Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
friedrichg
force-pushed
the
fix-retry-root-cause
branch
from
be6821e to
a1ed0ca
Compare
SungJin1212
approved these changes
Mar 26, 2026
Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
CharlieTLe
pushed a commit
to CharlieTLe/cortex
that referenced
this pull request
Apr 6, 2026
…ortexproject#7375) Signed-off-by: Charlie Le <charlie_le@apple.com>
friedrichg
added a commit
that referenced
this pull request
Apr 16, 2026
…7375) Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
2 tasks
friedrichg
added a commit
that referenced
this pull request
Apr 17, 2026
* Memberlist cas error code false positive (#7408) * use errors.As in getCasErrorCode to unwrap memberlist errors Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> * fix test Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> --------- Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * Fix nil when ingesterQueryMaxAttempts > 1 (#7369) * Trigger nil with test Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * Fix nil results Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * fix changelog Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> --------- Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * fix: alertmanager user config disappearing when ring is unreachable (#7372) * Fix multitenant alertmanager user config disappearing when ring is unreachable Signed-off-by: Kishore K G <kishorekg@google.com> * Add change log Signed-off-by: Kishore K G <kishorekg@google.com> * format multitenant Signed-off-by: Kishore K G <kishorekg@google.com> * fix pr number Signed-off-by: Kishore K G <kishorekg@google.com> * use ErrNotFound for error validation in unit test Signed-off-by: kishorekg1999 <kishorekg.github@gmail.com> --------- Signed-off-by: Kishore K G <kishorekg@google.com> Signed-off-by: kishorekg1999 <kishorekg@google.com> Signed-off-by: kishorekg1999 <kishorekg.github@gmail.com> Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * Clean Symbol Tables (#7373) Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * Fix root cause of nil return in queryWithRetry and labelsWithRetry (#7375) Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * fix regex resolver match 0 or 1 tenant bug (#7424) * fix regex resolver match 0 or 1 tenant bug Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> * fix test Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> --------- Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * skip nil values in Memberlist WatchPrefix (#7429) * skip nil values in Memberlist WatchPrefix Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> * fix lint Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> --------- Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * Remove duplicate CHANGELOG entry for #7373 Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * Fix integration test flag name for release-1.21 The cherry-pick of #7424 brought the master flag name -limits.query-ingesters-within, but release-1.21 still uses -querier.query-ingesters-within (renamed in #7160, master-only). Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> --------- Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> Signed-off-by: Kishore K G <kishorekg@google.com> Signed-off-by: kishorekg1999 <kishorekg@google.com> Signed-off-by: kishorekg1999 <kishorekg.github@gmail.com> Co-authored-by: SungJin1212 <tjdwls1201@gmail.com> Co-authored-by: kishorekg1999 <kishorekg.github@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
ctx.Err()fromqueryWithRetryandlabelsWithRetrywhen the backoff loop exits without executing (e.g. context cancelled before the first attempt), preventing(nil, nil)returnsstreamingSelectadded by Fix nil when ingesterQueryMaxAttempts > 1 #7369, since the root cause is now fixed at the sourcelabelsWithRetryearly-return check to use<= 1consistently withqueryWithRetryContext
PR #7369 fixed the immediate panic in
streamingSelectby guarding against nil results at the call site. However the root cause — both retry functions returning(nil, nil)— was still present, leavinglabelsWithRetrycallers (LabelNames,LabelValues) silently returning empty results with nil error on cancelled context.Test plan
TestDistributorQuerier_Select_CancelledContextto assertcontext.Cancelederror (not just no-panic)TestDistributorQuerier_Labels_CancelledContextcoveringLabelNamesandLabelValueswith cancelled context andingesterQueryMaxAttempts > 1