Skip to content

Upgrade Prometheus to master#2658

Merged
bwplotka merged 7 commits intothanos-io:masterfrom
pracucci:upgrade-prometheus-to-master
May 26, 2020
Merged

Upgrade Prometheus to master#2658
bwplotka merged 7 commits intothanos-io:masterfrom
pracucci:upgrade-prometheus-to-master

Conversation

@pracucci
Copy link
Contributor

@pracucci pracucci commented May 25, 2020

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

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.

Signed-off-by: Marco Pracucci <marco@pracucci.com>
h, err := tsdb.NewHead(nil, nil, nil, 1, tsdb.DefaultStripeSize)
h, err := tsdb.NewHead(nil, nil, nil, 1, dir, nil, tsdb.DefaultStripeSize, nil)
testutil.Ok(t, err)
defer testutil.Ok(t, h.Close())
Copy link
Contributor

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 😮

pracucci added 2 commits May 26, 2020 09:26
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
# 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"
Copy link
Contributor Author

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

Ganesh Vernekar and others added 2 commits May 26, 2020 15:44
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 Delete mmapped chunks after creating block from head
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.

Awesome, just linter issues I guess.

LGTM, anything to report on CHANGELOG? 🤔


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)
Copy link
Contributor

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

Ganesh Vernekar and others added 2 commits May 26, 2020 16:28
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
@codesome
Copy link
Contributor

Updated the changelog, linter seems to get killed arbitrarily but with a higher chance of getting killed

@bwplotka
Copy link
Member

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.

@bwplotka
Copy link
Member

I will look on that today

@codesome
Copy link
Contributor

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

@bwplotka
Copy link
Member

I can merge even and fix master then, happy with that.

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