Merge release 0.30 into main #6041

GiedriusS · 2023-01-12T16:37:33Z

Cherry-pick fixes from release branches into main. Put 95256a7 under "unreleased" because technically that change was never released.

yeya24 · 2023-01-12T16:47:04Z

Do we still plan to merge release branch 0.29 to main? There is another commit that we didn't include in this pr.

GiedriusS · 2023-01-12T16:48:24Z

Which commit that is? I'd prefer to merge everything back into main to avoid confusion. It's really confusing to accumulate commits in release branches if those releases never come out 😄

yeya24 · 2023-01-12T17:49:00Z

@GiedriusS This is not currently included dda0c25.

yeya24 · 2023-01-16T18:40:18Z

I agree it is confusing. Then can we just release 0.29.2 first then merge the fix commits back to main. Then release 0.30.1?

GiedriusS · 2023-01-16T20:06:03Z

We already use a newer minio-go so maybe we can skip that commit?

yeya24 · 2023-01-16T20:23:17Z

Yeah that makes sense. Then I think we are good to go. Maybe we can mention that fix in the changelog?

GiedriusS · 2023-01-17T07:43:55Z

It has been mentioned here and then here 😄 perhaps we should list all updates in objstore module updates in our CHANGELOG.md but perhaps let's discuss that in Slack?

yeya24 · 2023-01-17T07:49:11Z

I am good. Let's fix the conflict and release the fixes. Thanks!

in a favour of 86b4039 SyncMetas will retry if it's retriable. Also, the cleanPartialMarked calls are surrounded by runutil.Repeat() will be repeated, the ones not and are not retriable will throw an interrupt to run.Group() by returning err and Group will call cancel() as it's configured for its interrupt func. Signed-off-by: Seena Fallah <seenafallah@gmail.com> Signed-off-by: Seena Fallah <seenafallah@gmail.com>

* Cut v0.30.0-rc.0 Signed-off-by: bwplotka <bwplotka@gmail.com> * mdox fix. Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

* fix duplicate metrics registration in redis client (#6009) * fix duplicate metrics registration in redis client Signed-off-by: Kama Huang <kamatogo13@gmail.com> * fixed test Signed-off-by: Kama Huang <kamatogo13@gmail.com> Signed-off-by: Kama Huang <kamatogo13@gmail.com> * *: cut 0.30.1 Add CHANGELOG entry. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Kama Huang <kamatogo13@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Co-authored-by: Kama Huang <121007071+kama910@users.noreply.github.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

* Fix sampler defaults Signed-off-by: Matej Gera <matejgera@gmail.com> * Add CHANGELOG Signed-off-by: Matej Gera <matejgera@gmail.com> * Replace checkout with git-shallow-clone (#5829) Signed-off-by: Matej Gera <matejgera@gmail.com> Signed-off-by: Matej Gera <matejgera@gmail.com> Signed-off-by: Matej Gera <matejgera@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

GiedriusS · 2023-01-17T08:16:17Z

Updated, hopefully I haven't missed anything 😄

saswatamcode

Thanks! LGTM!

douglascamata

Thanks a lot, @GiedriusS! 🙇

Added re-try mechanism for store inital sync, where if the initial sync fails, it tries to do the initial sync again every 5 seconds for 15 seconds duration (total 3 re-tries for initial sync of store). Signed-off-by: Kartik-Garg <kartik.garg@infracloud.io> Store: Make initial sync more robust Added re-try mechanism for store inital sync, where if the initial sync fails, it tries to do the initial sync again every 5 seconds for 15 seconds duration (total 3 re-tries for initial sync of store). Signed-off-by: Kartik-Garg <kartik.garg@infracloud.io> Merge release 0.30 into main (thanos-io#6041) * compact: remove cancel on SyncMetas errors (thanos-io#5923) in a favour of 86b4039 SyncMetas will retry if it's retriable. Also, the cleanPartialMarked calls are surrounded by runutil.Repeat() will be repeated, the ones not and are not retriable will throw an interrupt to run.Group() by returning err and Group will call cancel() as it's configured for its interrupt func. Signed-off-by: Seena Fallah <seenafallah@gmail.com> Signed-off-by: Seena Fallah <seenafallah@gmail.com> * Cut v0.30.0-rc.0 (thanos-io#5992) * Cut v0.30.0-rc.0 Signed-off-by: bwplotka <bwplotka@gmail.com> * mdox fix. Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Cut 0.30.0 (thanos-io#6011) Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * *: cut 0.30.1 (thanos-io#6017) * fix duplicate metrics registration in redis client (thanos-io#6009) * fix duplicate metrics registration in redis client Signed-off-by: Kama Huang <kamatogo13@gmail.com> * fixed test Signed-off-by: Kama Huang <kamatogo13@gmail.com> Signed-off-by: Kama Huang <kamatogo13@gmail.com> * *: cut 0.30.1 Add CHANGELOG entry. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Kama Huang <kamatogo13@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Co-authored-by: Kama Huang <121007071+kama910@users.noreply.github.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Tracing: Fix sampler defaults (thanos-io#5887) * Fix sampler defaults Signed-off-by: Matej Gera <matejgera@gmail.com> * Add CHANGELOG Signed-off-by: Matej Gera <matejgera@gmail.com> * Replace checkout with git-shallow-clone (thanos-io#5829) Signed-off-by: Matej Gera <matejgera@gmail.com> Signed-off-by: Matej Gera <matejgera@gmail.com> Signed-off-by: Matej Gera <matejgera@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * CHANGELOG: fix Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Seena Fallah <seenafallah@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Kama Huang <kamatogo13@gmail.com> Signed-off-by: Matej Gera <matejgera@gmail.com> Co-authored-by: Seena Fallah <seenafallah@gmail.com> Co-authored-by: Kama Huang <121007071+kama910@users.noreply.github.com>

GiedriusS · 2023-01-18T11:29:55Z

@saswatamcode I think you've squashed this? 😄 https://github.com/thanos-io/thanos/blob/main/docs/release-process.md#completing-the-release some time ago we agreed not to use squash commits so that it would be easier for external users that import thanos as a Go module 😄 not a problem, just something to keep in mind

saswatamcode · 2023-01-18T11:34:21Z

Ah, I missed that! Really sorry @GiedriusS, will keep that in mind from next time! 😓

yeya24 · 2023-01-23T05:59:09Z

Are we going to release v0.29.1 and v0.30.2 soon?

saswatamcode · 2023-01-23T06:03:27Z

+1 would love to have those releases, cc: @douglascamata! 🙂

yeya24 · 2023-01-26T07:42:19Z

If no one is going to release it today, I will do it tomorrow my time.
Shall we also cherry pick #6066?

fpetkovski · 2023-01-26T07:46:44Z

Will 30.2 be released from main or do we cherry pick bugfixes only?

douglascamata · 2023-01-26T09:54:41Z

In theory, 0.30.2 should include only bugfixes, so will have to cherry pick #6066, otherwise we would be including huge features that might be better off waiting for 0.31 (like the native histogram support in many components).

fpetkovski · 2023-01-26T10:05:16Z

Makes sense 👍 We should maybe just bump the thanos engine version since we have some bugfixes there that we haven't released yet. One such issue came up in #6073.

* compact: remove cancel on SyncMetas errors (thanos-io#5923) in a favour of 86b4039 SyncMetas will retry if it's retriable. Also, the cleanPartialMarked calls are surrounded by runutil.Repeat() will be repeated, the ones not and are not retriable will throw an interrupt to run.Group() by returning err and Group will call cancel() as it's configured for its interrupt func. Signed-off-by: Seena Fallah <seenafallah@gmail.com> Signed-off-by: Seena Fallah <seenafallah@gmail.com> * Cut v0.30.0-rc.0 (thanos-io#5992) * Cut v0.30.0-rc.0 Signed-off-by: bwplotka <bwplotka@gmail.com> * mdox fix. Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Cut 0.30.0 (thanos-io#6011) Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * *: cut 0.30.1 (thanos-io#6017) * fix duplicate metrics registration in redis client (thanos-io#6009) * fix duplicate metrics registration in redis client Signed-off-by: Kama Huang <kamatogo13@gmail.com> * fixed test Signed-off-by: Kama Huang <kamatogo13@gmail.com> Signed-off-by: Kama Huang <kamatogo13@gmail.com> * *: cut 0.30.1 Add CHANGELOG entry. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Kama Huang <kamatogo13@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Co-authored-by: Kama Huang <121007071+kama910@users.noreply.github.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Tracing: Fix sampler defaults (thanos-io#5887) * Fix sampler defaults Signed-off-by: Matej Gera <matejgera@gmail.com> * Add CHANGELOG Signed-off-by: Matej Gera <matejgera@gmail.com> * Replace checkout with git-shallow-clone (thanos-io#5829) Signed-off-by: Matej Gera <matejgera@gmail.com> Signed-off-by: Matej Gera <matejgera@gmail.com> Signed-off-by: Matej Gera <matejgera@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * CHANGELOG: fix Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Seena Fallah <seenafallah@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Kama Huang <kamatogo13@gmail.com> Signed-off-by: Matej Gera <matejgera@gmail.com> Co-authored-by: Seena Fallah <seenafallah@gmail.com> Co-authored-by: Kama Huang <121007071+kama910@users.noreply.github.com>

pull-request-size bot added the size/L label Jan 12, 2023

clwluvw and others added 5 commits January 17, 2023 10:04

Cut v0.30.0-rc.0 (#5992)

c51a715

* Cut v0.30.0-rc.0 Signed-off-by: bwplotka <bwplotka@gmail.com> * mdox fix. Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

Cut 0.30.0 (#6011)

a4ab952

Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: bwplotka <bwplotka@gmail.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

GiedriusS force-pushed the merge-release-0.30-into-main branch 2 times, most recently from 8c16793 to cef1843 Compare January 17, 2023 08:14

CHANGELOG: fix

0ff9723

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

GiedriusS force-pushed the merge-release-0.30-into-main branch from cef1843 to 0ff9723 Compare January 17, 2023 08:15

saswatamcode approved these changes Jan 17, 2023

View reviewed changes

douglascamata approved these changes Jan 17, 2023

View reviewed changes

saswatamcode merged commit 5714506 into main Jan 18, 2023

GiedriusS deleted the merge-release-0.30-into-main branch January 18, 2023 12:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge release 0.30 into main #6041

Merge release 0.30 into main #6041

GiedriusS commented Jan 12, 2023

yeya24 commented Jan 12, 2023

GiedriusS commented Jan 12, 2023

yeya24 commented Jan 12, 2023

yeya24 commented Jan 16, 2023

GiedriusS commented Jan 16, 2023

yeya24 commented Jan 16, 2023

GiedriusS commented Jan 17, 2023

yeya24 commented Jan 17, 2023

GiedriusS commented Jan 17, 2023

saswatamcode left a comment

douglascamata left a comment

GiedriusS commented Jan 18, 2023

saswatamcode commented Jan 18, 2023

yeya24 commented Jan 23, 2023

saswatamcode commented Jan 23, 2023

yeya24 commented Jan 26, 2023

fpetkovski commented Jan 26, 2023

douglascamata commented Jan 26, 2023 •

edited

Loading

fpetkovski commented Jan 26, 2023

Merge release 0.30 into main #6041

Merge release 0.30 into main #6041

Conversation

GiedriusS commented Jan 12, 2023

yeya24 commented Jan 12, 2023

GiedriusS commented Jan 12, 2023

yeya24 commented Jan 12, 2023

yeya24 commented Jan 16, 2023

GiedriusS commented Jan 16, 2023

yeya24 commented Jan 16, 2023

GiedriusS commented Jan 17, 2023

yeya24 commented Jan 17, 2023

GiedriusS commented Jan 17, 2023

saswatamcode left a comment

Choose a reason for hiding this comment

douglascamata left a comment

Choose a reason for hiding this comment

GiedriusS commented Jan 18, 2023

saswatamcode commented Jan 18, 2023

yeya24 commented Jan 23, 2023

saswatamcode commented Jan 23, 2023

yeya24 commented Jan 26, 2023

fpetkovski commented Jan 26, 2023

douglascamata commented Jan 26, 2023 • edited Loading

fpetkovski commented Jan 26, 2023

douglascamata commented Jan 26, 2023 •

edited

Loading