From 6cdc1ae96d14872084a60450ad03b674bf2cb305 Mon Sep 17 00:00:00 2001 From: SungJin1212 Date: Thu, 5 Dec 2024 21:39:58 +0900 Subject: [PATCH 1/4] Fix potential deadlock in hedging request (#7962) Signed-off-by: SungJin1212 --- pkg/exthttp/hedging.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/exthttp/hedging.go b/pkg/exthttp/hedging.go index 09a1b3e8a2..af200bd92e 100644 --- a/pkg/exthttp/hedging.go +++ b/pkg/exthttp/hedging.go @@ -48,11 +48,11 @@ func (hrt *hedgingRoundTripper) RoundTrip(req *http.Request) (*http.Response, er } duration := float64(time.Since(start).Milliseconds()) hrt.mu.Lock() + defer hrt.mu.Unlock() err = hrt.TDigest.Add(duration) if err != nil { return nil, err } - hrt.mu.Unlock() return resp, err } From 351f75b5971d146a87951f65371eb4cc77a2c67b Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Tue, 10 Dec 2024 11:22:07 +0100 Subject: [PATCH 2/4] sidecar: fix limit mintime (#7970) Signed-off-by: Michael Hoffmann Signed-off-by: Saswata Mukherjee --- CHANGELOG.md | 13 +++++++++++++ cmd/thanos/sidecar.go | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e92927842d..c33c4e2c5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,19 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re ### Fixed +### Added + +- [#7907](https://github.com/thanos-io/thanos/pull/7907) Receive: Add `--receive.grpc-service-config` flag to configure gRPC service config for the receivers. +- [#7961](https://github.com/thanos-io/thanos/pull/7961) Store Gateway: Add `--store.posting-group-max-keys` flag to mark posting group as lazy if it exceeds number of keys limit. Added `thanos_bucket_store_lazy_expanded_posting_groups_total` for total number of lazy posting groups and corresponding reasons. + +### Changed + +### Removed + +## [v0.37.1](https://github.com/thanos-io/thanos/tree/release-0.37) - 04.12.2024 + +### Fixed + - [#7674](https://github.com/thanos-io/thanos/pull/7674) Query-frontend: Fix connection to Redis cluster with TLS. - [#7945](https://github.com/thanos-io/thanos/pull/7945) Receive: Capnproto - use segment from existing message. - [#7941](https://github.com/thanos-io/thanos/pull/7941) Receive: Fix race condition when adding multiple new tenants, see [issue-7892](https://github.com/thanos-io/thanos/issues/7892). diff --git a/cmd/thanos/sidecar.go b/cmd/thanos/sidecar.go index 127584ea94..531ffb8ab4 100644 --- a/cmd/thanos/sidecar.go +++ b/cmd/thanos/sidecar.go @@ -505,7 +505,7 @@ func (s *promMetadata) UpdateTimestamps(ctx context.Context) error { return err } - s.mint = min(s.limitMinTime.PrometheusTimestamp(), mint) + s.mint = max(s.limitMinTime.PrometheusTimestamp(), mint) s.maxt = math.MaxInt64 return nil From 49a0587b54c08d23e6f0c97edd3910133ffef906 Mon Sep 17 00:00:00 2001 From: Saswata Mukherjee Date: Wed, 11 Dec 2024 08:30:03 +0000 Subject: [PATCH 3/4] Cut patch release v0.37.2 Signed-off-by: Saswata Mukherjee --- CHANGELOG.md | 13 +++++++++++++ VERSION | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c33c4e2c5c..b7dd6ad23e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,19 @@ NOTE: As semantic versioning states all 0.y.z releases can contain breaking chan We use *breaking :warning:* to mark changes that are not backward compatible (relates only to v0.y.z releases.) +## [v0.37.2](https://github.com/thanos-io/thanos/tree/release-0.37) - 11.12.2024 + +### Fixed + +- [#7970](https://github.com/thanos-io/thanos/pull/7970) Sidecar: Respect min-time setting. +- [#7962](https://github.com/thanos-io/thanos/pull/7962) Store: Fix potential deadlock in hedging request. + +### Added + +### Changed + +### Removed + ## [v0.37.1](https://github.com/thanos-io/thanos/tree/release-0.37) - 03.12.2024 ### Fixed diff --git a/VERSION b/VERSION index 9b1bb85123..8570a3aeb9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.37.1 +0.37.2 From c071d513f9aea2023b05b407bde3145f109129ef Mon Sep 17 00:00:00 2001 From: Saswata Mukherjee Date: Wed, 11 Dec 2024 08:46:51 +0000 Subject: [PATCH 4/4] Fix changelog Signed-off-by: Saswata Mukherjee --- CHANGELOG.md | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7dd6ad23e..111b18db46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,19 +21,6 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re ### Removed -## [v0.37.1](https://github.com/thanos-io/thanos/tree/release-0.37) - 03.12.2024 - -### Fixed - -### Added - -- [#7907](https://github.com/thanos-io/thanos/pull/7907) Receive: Add `--receive.grpc-service-config` flag to configure gRPC service config for the receivers. -- [#7961](https://github.com/thanos-io/thanos/pull/7961) Store Gateway: Add `--store.posting-group-max-keys` flag to mark posting group as lazy if it exceeds number of keys limit. Added `thanos_bucket_store_lazy_expanded_posting_groups_total` for total number of lazy posting groups and corresponding reasons. - -### Changed - -### Removed - ## [v0.37.1](https://github.com/thanos-io/thanos/tree/release-0.37) - 04.12.2024 ### Fixed