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.

Sign up for GitHub

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

Jump to bottom

Chore: Update Thanos #6189

Merged
merged 1 commit into from
Sep 4, 2024
Merged

Chore: Update Thanos #6189

merged 1 commit into from
Sep 4, 2024

Conversation

harry671003
Copy link
Contributor

@harry671003 harry671003 commented Sep 4, 2024 •
edited
Loading

What this PR does:

  • Update Thanos to 09db52562de0984d097554387274a654db19ce83
> go get github.com/thanos-io/thanos@09db52562de0984d097554387274a654db19ce83
> go mod tidy
> go mod vendor

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@yeya24
Copy link
Contributor

yeya24 commented Sep 4, 2024

Is the data race relevant to this change? Looks a bit concerning

@pull-request-size pull-request-size bot added size/L and removed size/M labels Sep 4, 2024
@harry671003 harry671003 force-pushed the update_thanos branch 2 times, most recently from e70c9c5 to f5e8961 Compare September 4, 2024 20:26
@harry671003
Copy link
Contributor Author

@yeya24 - The data race seems to have gone away in the latest change.

yeya24
yeya24 reviewed Sep 4, 2024
View reviewed changes
pkg/ruler/user2/namespace Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Those files are used for testing only and should be excluded.

Copy link
Contributor Author

@harry671003 harry671003 Sep 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Removed the files from this PR.

Fixing this permanently: #6193

pkg/compactor/compactor_test.go
"cortex_compactor_block_cleanup_started_total",
"cortex_compactor_block_cleanup_completed_total",
"cortex_compactor_block_cleanup_failed_total",
Copy link
Contributor

Choose a reason for hiding this comment

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

Why those metrics are removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This metric names list is only used for choosing which metric names to compare. Previously, testutil.GatherAndCompare() was very lenient. If a metric name was not present in the list, it'll ignore it. But now, it'll fail with expected metric name(s) not found.

@harry671003
Chore: Update Thanos
75d13b3 
Signed-off-by: 🌲 Harry 🌊 John 🏔 <johrry@amazon.com>
yeya24
yeya24 approved these changes Sep 4, 2024
View reviewed changes
Copy link
Contributor

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

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

Thanks!

@yeya24 yeya24 merged commit db1894c into cortexproject:master Sep 4, 2024
16 checks passed
@harry671003 harry671003 deleted the update_thanos branch October 30, 2024 01:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yeya24 yeya24 yeya24 approved these changes

Assignees
No one assigned
Labels
size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@harry671003 @yeya24