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

Update prometheus dependency to commit #8836 #4247

Merged
merged 2 commits into from
May 20, 2021

Conversation

yeya24
Copy link
Contributor

@yeya24 yeya24 commented May 18, 2021

Signed-off-by: yeya24 yb532204897@gmail.com

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

Changes

This pr updates Prometheus dependency to prometheus/prometheus@0a89124.

Split from pr #4239.

This update included commit prometheus/prometheus#8723, which breaks the existing TSDB store test. The writability and readability are not deterministic so I removed most of the tests. Let me know if there is a better way to solve this.

Verification

@yeya24 yeya24 changed the title Update prometheus dependency to commit 0a8912433a457b54a871df75e72afc… Update prometheus dependency to commit #8836 May 18, 2021
@yeya24
Copy link
Contributor Author

yeya24 commented May 18, 2021

This testcase https://github.com/thanos-io/thanos/blob/main/pkg/store/bucket_test.go#L1938 is also broken due to the recent 120 chunks split change in Prometheus.

Any idea about how to fix or change it? @metalmatze @bwplotka @onprem

@bwplotka
Copy link
Member

Hah, well looks like we relied on this ;p

// This method relies on a bug in TSDB Compactor which will just merge overlapping chunks into one big chunk.// If compactor is fixed in the future, we may need a different way of generating the block, or commit// existing block to the repository.

I think, maybe it's time to remove all tests relying on such large chunk situation, since. we hopefully don't have such?

…3e45a31d5c

Signed-off-by: yeya24 <yb532204897@gmail.com>
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.

LGTM, just I am worried about other removed tests around Flush.. why?

@@ -684,49 +649,6 @@ func TestTSDBStore_SeriesAccessWithoutDelegateClosing(t *testing.T) {
_ = string(c.Raw.Data) // Access bytes by converting them to different type.
}))
}
testutil.NotOk(t, testutil.FaultOrPanicToErr(func() {
Copy link
Member

Choose a reason for hiding this comment

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

Why those are removed?

@@ -595,26 +580,6 @@ func TestTSDBStore_SeriesAccessWithDelegateClosing(t *testing.T) {
// Let's close pending querier!
testutil.Equals(t, 1, len(csrv.closers))
testutil.Ok(t, csrv.closers[0].Close())

// Expect flush and close to be unblocked and without errors.
Copy link
Member

Choose a reason for hiding this comment

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

Why those are removed?

Copy link
Member

Choose a reason for hiding this comment

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

hmmm prometheus/prometheus#8723 ... Can we skip them instead 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, that's a better option.

Signed-off-by: yeya24 <yb532204897@gmail.com>
@yeya24
Copy link
Contributor Author

yeya24 commented May 19, 2021

@bwplotka PR updated, let me know if I need to update anything else.

Copy link
Member

@kakkoyun kakkoyun left a comment

Choose a reason for hiding this comment

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

LGTM 🎉 🚀

@yeya24
Copy link
Contributor Author

yeya24 commented May 20, 2021

Issue opened #4266. Will merge it.

@yeya24 yeya24 merged commit 39916a8 into thanos-io:main May 20, 2021
@yeya24 yeya24 deleted the update-prom-dependency branch May 20, 2021 17:36
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