Merge pull request #7980 from saswatamcode/cut-release-0.37.2

saswatamcode · SungJin1212 · MichaHoffmann · web-flow · commit 18291a78d4c6 · 2024-12-11T09:03:29.000Z
* Fix potential deadlock in hedging request (#7962) Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> * sidecar: fix limit mintime (#7970) Signed-off-by: Michael Hoffmann <mhoffm@posteo.de> Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> * Cut patch release v0.37.2 Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> * Fix changelog Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> --------- Signed-off-by: SungJin1212 <tjdwls1201@gmail.com> Signed-off-by: Michael Hoffmann <mhoffm@posteo.de> Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> Co-authored-by: SungJin1212 <tjdwls1201@gmail.com> Co-authored-by: Michael Hoffmann <mhoffm@posteo.de>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,20 @@ 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.1](https://github.com/thanos-io/thanos/tree/release-0.37) - 03.12.2024
+## [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) - 04.12.2024
 
 ### Fixed
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.37.1
+0.37.2
diff --git 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
diff --git 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
 }
 

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ func (s *promMetadata) UpdateTimestamps(ctx context.Context) error {`
`505`	`505`	`return err`
`506`	`506`	`}`
`507`	`507`
`508`		`- s.mint = min(s.limitMinTime.PrometheusTimestamp(), mint)`
	`508`	`+ s.mint = max(s.limitMinTime.PrometheusTimestamp(), mint)`
`509`	`509`	`s.maxt = math.MaxInt64`
`510`	`510`
`511`	`511`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ func (hrt hedgingRoundTripper) RoundTrip(req http.Request) (*http.Response, er`
`48`	`48`	`}`
`49`	`49`	`duration := float64(time.Since(start).Milliseconds())`
`50`	`50`	`hrt.mu.Lock()`
	`51`	`+ defer hrt.mu.Unlock()`
`51`	`52`	`err = hrt.TDigest.Add(duration)`
`52`	`53`	`if err != nil {`
`53`	`54`	`return nil, err`
`54`	`55`	`}`
`55`		`- hrt.mu.Unlock()`
`56`	`56`	`return resp, err`
`57`	`57`	`}`
`58`	`58`