MQE: add version to query plans, and enforce that queriers only evaluate plans they support #12808
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
…ate plans they support
56quarters
approved these changes
Sep 25, 2025
| // It returns references to the specified nodeIndices. | ||
| func (p *EncodedQueryPlan) ToDecodedPlan(nodeIndices ...int64) (*QueryPlan, []Node, error) { | ||
| if p.Version > MaximumSupportedQueryPlanVersion { | ||
| return nil, nil, apierror.Newf(apierror.TypeBadData, "query plan has version %v, but the maximum supported query plan version is %v", p.Version, MaximumSupportedQueryPlanVersion) |
There was a problem hiding this comment.
Why the use of apierror here? It seems odd to use an error specific to the Prometheus HTTP API.
There was a problem hiding this comment.
Maybe I've been using apierror wrong this whole time - I view it as a way to hint what kind of error it is, so that the API endpoint logic doesn't need to know about every kind of error and how to translate that to an error code / HTTP status code.
Is there something else you had in mind instead?
|
Given the approval, I'm going to merge this so we can start testing it. We can continue discussing the error type and make any changes in a follow-up PR. |
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.
What this PR does
This PR adds a version number to query plans, and modifies the behaviour of
EncodedQueryPlan.ToDecodedPlanto ensure that queriers only evaluate query plans they support.Which issue(s) this PR fixes or relates to
#12302 and #12551
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]. If changelog entry is not needed, please add thechangelog-not-neededlabel to the PR.about-versioning.mdupdated with experimental features.