Update Cortex to recent master (1.5.0+, 35e698bb56d6). #2923
Conversation
This file contains 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
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
|
Not sure if tests are failing or it was just a blip ? |
I see failure in |
|
FYI @pstibrany We are awaiting the cut of 2.1 before this. |
|
This issue has been automatically marked as stale because it has not had any activity in the past 30 days. It will be closed in 7 days if no further activity occurs. Thank you for your contributions. |
|
There is now Cortex 1.6.0 out, so this PR can be updated to that instead. |
stale
bot
removed
the
stale
cyriltovena
added
the
keepalive
|
Closing in favor of a newer PR. You've been co-authored. |
|
OK, thanks for update. Co-authoring wasn't necessary :) What is the PR? |
|
Found it: #3131 |
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 / why we need it: This PR updates vendored Cortex version in Loki to recent master (post 1.5.0 release, commit cortexproject/cortex@35e698b).
Main goal was to integrate query-frontend refactorings to Loki. Cortex now has new "scheduler" component, which is basically external queue of requests, moved from query-frontend. In this PR, Loki doesn't support scheduler, and only uses original query-frontend. Supported options should be the same as before this PR.
Querier worker has new
-querier.scheduler-addressoption, and existing options now refer to query-scheduler as well, which doesn't apply to Loki. Instead of reusing config struct from Cortex, we could introduce Loki-specific config struct, which would allow us to hide query-scheduler messages and options. WDYT? Alternative is to make Loki support query-scheduler, but I'd suggest doing that in a separate PR.Special notes for your reviewer: This PR also integrates ring changes -- split of
ReadRing.GetAlltoGetAllHealthyandGetReplicationSetForOperationmethods. Please double check that my changes around this make sense, as ring still makes my head spin sometimes.Checklist