promql: fix topk error on NaN argument for non-existing series #16725
Conversation
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
machine424
reviewed
Jun 16, 2025
machine424
reviewed
Jun 16, 2025
50447ec to
80d4329
Compare
machine424
reviewed
Jun 17, 2025
80d4329 to
cf0b039
Compare
beorn7
requested changes
Jun 22, 2025
cf0b039 to
6fda1cc
Compare
Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com>
6fda1cc to
44ee5e2
Compare
|
Added the explicit warning message into the acceptance tests. |
krajorama
added a commit
to grafana/mimir
that referenced
this pull request
Jul 10, 2025
## Manual follow-ups @krajorama : I've updated the engine tests from upstream (prometheus/prometheus#16725). There was one that has a different error message with MQE so I only added it to *ours* tests. Maybe we want to fix the error message instead? Commented. @krajorama : I've followed up the block stats changes (prometheus/prometheus#16824) by adding the necessary code in Mimir and also more tests. I've followed BlockStats.NumSamples to find all occurrences. Even if I wasn't successful , we don't actually use the new fields for anything critical - so this should be safe. ## Update mimir-prometheus dependency *This PR was automatically created by the [update-vendored-mimir-prometheus.yml](https://github.com/grafana/mimir/blob/main/.github/workflows/update-vendored-mimir-prometheus.yml) workflow.* ### Details: - **Source branch/ref**: [`main`](https://github.com/grafana/mimir-prometheus/tree/main) - **Previous commit**: [`609b9c7c04c1`](grafana/mimir-prometheus@609b9c7c04c1) - **New commit**: [`8323300263566d178c6d571d985924fbd4270225`](grafana/mimir-prometheus@8323300) - **Changes**: [`609b9c7c04c1...8323300263566d178c6d571d985924fbd4270225`](grafana/mimir-prometheus@609b9c7...8323300) --------- Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: mimir-github-bot[bot] <mimir-github-bot[bot]@users.noreply.github.com> Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: Charles Korn <charles.korn@grafana.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
topk(NaN, non_existent)used to return an error, it stopped after https://github.com/prometheus/prometheus/pull/16404/files.This is a minor issue, but broke thanos regression tests