chore: introduce mw to route requests between v1 and v2 engines #19452
+747
−57
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
|
💻 Deploy preview deleted. |
chaudum
reviewed
Oct 10, 2025
pkg/engine/engine.go
Outdated
| } | ||
|
|
||
| func (cfg *Config) ValidQueryRange() (time.Time, time.Time) { | ||
| return time.Time(cfg.DataobjAvailableFrom), time.Now().Add(-cfg.DataobjGenerationLagDuration) |
There was a problem hiding this comment.
Should these return UTC times?
There was a problem hiding this comment.
updated. i am guessing this would only help with debugging if we print this somewhere? functionally for time comparisons, this should be a no-op
| } | ||
|
|
||
| // Merge responses | ||
| return e.merger.MergeResponse(responses...) |
There was a problem hiding this comment.
Does the merger require responses to be sorted?
There was a problem hiding this comment.
it internally sorts them
Comment on lines
181
to
182
| // TODO: Add handler for v2 engine. | ||
| panic("V2 engine handler not implemented") |
There was a problem hiding this comment.
Where is the handler created?
There was a problem hiding this comment.
i have moved this to newEngineRouterMiddleware arguments, to be linked once we have new scheduler and its handler.
enabling v2 engine on frontend before adding this handler will reuslt in a panic.
chaudum
approved these changes
Oct 14, 2025
pkg/engine/engine.go
Outdated
Comment on lines
73
to
74
| DataobjAvailableFrom dskit_flagext.Time `yaml:"dataobj_available_from" category:"experimental"` | ||
| DataobjGenerationLagDuration time.Duration `yaml:"dataobj_generation_lag_duration" category:"experimental"` |
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.
What this PR does / why we need it:
This PR adds a new engine router middleware that breaks down the request into v1 and v2 query splits.
v1(chunks) requests are additionally split, sharded and cached same as now. v2 request is handed off to the new engine handler (yet to be implemented). This change only applies to range metric queries and log queries.
This change is intended to be a no-op if
querier.engine-v2.enableflag is set to false on the query-frontend.Two now configs are introduced to define the time ranges for which v2 engine handling is applicable.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mddeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR