Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Cortex into Thanos #3432

Merged
merged 2 commits into from
Nov 12, 2020
Merged

Conversation

pracucci
Copy link
Contributor

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

We recently refactored the query-frontend in Cortex, in order to introduce the support for a new component (query-scheduler used by query-frontend v2). The "old" query-frontend logic (v1) has been left untouched, a part from some package refactoring. Also the v1 doesn't handle the downstream, slow query logging and response compression anymore, but they're available as pluggable middlewares.

In this PR I've upgraded Cortex and done the required changes 🤞

Note: this upgrade has the nice side effect that Thanos will not vendor anymore Cortex pkg/storegateway, thus unblocking the PR #3431.

Verification

Existing tests.

Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci requested a review from yeya24 November 11, 2020 17:51
Copy link
Contributor

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Tested it manually as well!

Signed-off-by: Marco Pracucci <marco@pracucci.com>
@yeya24
Copy link
Contributor

yeya24 commented Nov 11, 2020

There is a new supported config in the limits middleware https://github.com/cortexproject/cortex/blob/master/pkg/querier/queryrange/limits.go#L61.

I think it is useful and we should support it. I will open a feature request to track this.

Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amazing, Thanks for the work 💪

@pracucci
Copy link
Contributor Author

There is a new supported config in the limits middleware https://github.com/cortexproject/cortex/blob/master/pkg/querier/queryrange/limits.go#L61.

I think it is useful and we should support it. I will open a feature request to track this.

@yeya24 Sure. Just pay attention this applies only to range queries. It should work in conjunction with the same limit applied in the querier, and not just in the query-frontend.

@pracucci pracucci merged commit 82e7da7 into thanos-io:master Nov 12, 2020
@pracucci pracucci deleted the update-vendored-cortex branch November 12, 2020 07:56
Oghenebrume50 pushed a commit to Oghenebrume50/thanos that referenced this pull request Dec 7, 2020
* Upgrade Cortex into Thanos

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Removed unused CortexFrontendConfig

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Oghenebrume50 <raphlbrume@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants