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

Revendor cortex to latest master #2794

Merged
merged 4 commits into from
Oct 26, 2020

Conversation

sandeepsukhani
Copy link
Contributor

@sandeepsukhani sandeepsukhani commented Oct 23, 2020

What this PR does / why we need it:
There are some fixes in object client in Cortex which would be good to have for avoiding any problems running boltdb-shipper.
I have taken care of some of the changes done in Cortex, most important ones are at https://github.com/grafana/loki/blob/d580aa9da860d5bceee606cc5420c8eb20b275aa/pkg/querier/queryrange/queryrange.pb.patch.go

Checklist

  • Tests updated

@codecov-io
Copy link

Codecov Report

Merging #2794 into master will decrease coverage by 0.07%.
The diff coverage is 36.84%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2794      +/-   ##
==========================================
- Coverage   61.39%   61.32%   -0.08%     
==========================================
  Files         177      178       +1     
  Lines       14394    14419      +25     
==========================================
+ Hits         8837     8842       +5     
- Misses       4748     4763      +15     
- Partials      809      814       +5     
Impacted Files Coverage Δ
pkg/distributor/http.go 0.00% <0.00%> (ø)
pkg/loki/loki.go 0.00% <ø> (ø)
pkg/loki/modules.go 3.61% <0.00%> (-0.02%) ⬇️
pkg/querier/queryrange/queryrange.pb.patch.go 41.17% <41.17%> (ø)
pkg/querier/queryrange/codec.go 87.88% <100.00%> (+0.22%) ⬆️
pkg/promtail/targets/file/filetarget.go 64.08% <0.00%> (-2.12%) ⬇️
pkg/storage/stores/shipper/uploads/table.go 68.66% <0.00%> (-1.85%) ⬇️
...kg/storage/stores/shipper/uploads/table_manager.go 65.78% <0.00%> (-1.76%) ⬇️
pkg/logql/evaluator.go 89.64% <0.00%> (-0.40%) ⬇️
... and 1 more

Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

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

lgtm. We've called these proto add-on methods extensions.go before (https://github.com/grafana/loki/blob/master/pkg/logproto/extensions.go) if you'd like to keep this consistent.

@sandeepsukhani
Copy link
Contributor Author

sandeepsukhani commented Oct 26, 2020

lgtm. We've called these proto add-on methods extensions.go before (https://github.com/grafana/loki/blob/master/pkg/logproto/extensions.go) if you'd like to keep this consistent.

Sounds good. Renamed it.
Thanks for the review!

@sandeepsukhani sandeepsukhani merged commit 071a208 into grafana:master Oct 26, 2020
@sandeepsukhani sandeepsukhani deleted the revendor-cortex branch May 28, 2021 06:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants