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

loki: update Cortex to master #1799

Merged
merged 5 commits into from
Mar 17, 2020
Merged

loki: update Cortex to master #1799

merged 5 commits into from
Mar 17, 2020

Conversation

pstibrany
Copy link
Member

What this PR does / why we need it: This PR updates Cortex to latest master. There are some changes in Loki code to accommodate for changes in Cortex (specifically, Lifecycler no longer exiting on its own, and frontend worker no longer starting on its own)

Checklist

  • Documentation added
  • Tests updated

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
- Frontend worker now needs to be started explicitly
- Lifecycler no longer exits on error. Distributor and Ingester do that now

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
go.mod Outdated
@@ -10,7 +10,7 @@ require (
github.com/containerd/containerd v1.3.2 // indirect
github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 // indirect
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
github.com/cortexproject/cortex v0.7.0-rc.0
github.com/cortexproject/cortex v0.6.1-0.20200312144321-c105d22e5ad0
Copy link
Collaborator

Choose a reason for hiding this comment

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

is this going down a revision because this is current master vs whatever is in 0.7.0rc?

Copy link
Member Author

Choose a reason for hiding this comment

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

Go finds latest version tag reachable from commit, and uses that as version number. 0.7* tags are not reachable from master, since release branch wasn't merged to master yet.

Copy link
Member

Choose a reason for hiding this comment

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

Do we have any guarantees we don't rely on something from 0.7.0-rc.0?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've pushed new update that updates this to 0.7.1-* now. It is master, with release-0.7 branch merged in.

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

Thank you for keeping Loki updated, this is extremely helpful

I only had a couple questions but this looks good!

@pstibrany pstibrany mentioned this pull request Mar 13, 2020
2 tasks
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
@codecov-io
Copy link

codecov-io commented Mar 14, 2020

Codecov Report

Merging #1799 into master will decrease coverage by 0.06%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1799      +/-   ##
==========================================
- Coverage   64.78%   64.72%   -0.07%     
==========================================
  Files         122      122              
  Lines        9190     9202      +12     
==========================================
+ Hits         5954     5956       +2     
- Misses       2823     2832       +9     
- Partials      413      414       +1     
Impacted Files Coverage Δ
pkg/distributor/distributor.go 71.24% <0.00%> (-1.92%) ⬇️
pkg/ingester/ingester.go 58.33% <0.00%> (-1.54%) ⬇️
pkg/loki/loki.go 0.00% <ø> (ø)
pkg/loki/modules.go 12.78% <0.00%> (-0.24%) ⬇️
pkg/logql/evaluator.go 91.81% <0.00%> (+0.58%) ⬆️

….1-...

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
@owen-d owen-d merged commit ca19683 into grafana:master Mar 17, 2020
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.

5 participants