-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Upgrade Prometheus to master #2658
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 Prometheus to master #2658
Conversation
Signed-off-by: Marco Pracucci <[email protected]>
testutil.Ok(t, err) | ||
defer testutil.Ok(t, h.Close()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder how did this not cause an issue before 😮
Signed-off-by: Marco Pracucci <[email protected]>
Signed-off-by: Marco Pracucci <[email protected]>
@@ -17,7 +17,7 @@ jobs: | |||
# cores (> 30) while the CPU and RAM resources are throttled. If we | |||
# don't limit this to the number of allocated cores, the job is | |||
# likely to get OOMed and killed. | |||
GOOPTS: "-p 2" | |||
GOOPTS: "-p 1" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I further reduced it because make lint
was failing this way:
https://circleci.com/gh/thanos-io/thanos/9391
Signed-off-by: Ganesh Vernekar <[email protected]>
Delete mmapped chunks after creating block from head
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Awesome, just linter issues I guess.
LGTM, anything to report on CHANGELOG? 🤔
pkg/store/postings_codec_test.go
Outdated
@@ -14,7 +14,7 @@ import ( | |||
) | |||
|
|||
func TestDiffVarintCodec(t *testing.T) { | |||
h, err := tsdb.NewHead(nil, nil, nil, 1000, tsdb.DefaultStripeSize) | |||
h, err := tsdb.NewHead(nil, nil, nil, 1000, "", nil, tsdb.DefaultStripeSize, nil) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the chunk directory should be a temp dir, will push a fix
Signed-off-by: Ganesh Vernekar <[email protected]>
Update CHANGELOG and unit test
Updated the changelog, linter seems to get killed arbitrarily but with a higher chance of getting killed |
Well @codesome is an OOM. I have an idea, we could make a linting in GH action instead, those might be more capable, but let's looks on that next PR. |
I will look on that today |
Can we re-run this and hope for this to be green to unblock this PR? :) I saw that it was green a while ago |
I can merge even and fix master then, happy with that. |
Changes
In Cortex we're currently blocked by Prometheus update. In this PR I'm attempting an update like @krasi-georgiev correctly did in in #2633, without reworking the
FlushableStorage
to hopefully get it in a mergeable state quicker 🤞Verification
Tests.