Skip to content

Release 0.39.2#8379

Merged
MichaHoffmann merged 3 commits intorelease-0.39from
rel_0392
Jul 21, 2025
Merged

Release 0.39.2#8379
MichaHoffmann merged 3 commits intorelease-0.39from
rel_0392

Conversation

@MichaHoffmann
Copy link
Contributor

@MichaHoffmann MichaHoffmann commented Jul 17, 2025

Prepare release 0.39.2

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

Changes

Verification

@MichaHoffmann MichaHoffmann changed the base branch from main to release-0.39 July 17, 2025 14:11
@MichaHoffmann MichaHoffmann changed the title Rel 0392 Release 0.39.2 Jul 17, 2025
MichaHoffmann and others added 3 commits July 17, 2025 14:17
Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com>
Thanos Query crashes with "concurrent map iteration and map write" panic
in distributed mode when multiple goroutines access the same `annotations.Annotations`
map concurrently.

```
panic: concurrent map iteration and map write
github.com/prometheus/prometheus/util/annotations.(*Annotations).Merge(...)
github.com/thanos-io/promql-engine/engine.(*compatibilityQuery).Exec(...)
```

Here I replaced direct access to `res.Warnings.AsErrors()` with a thread-safe copy:
```go
// Before (unsafe)
warnings = append(warnings, res.Warnings.AsErrors()...)

// After (thread-safe)
safeWarnings := annotations.New().Merge(res.Warnings)
warnings = append(warnings, safeWarnings.AsErrors()...)
```

Signed-off-by: Joel Verezhak <jverezhak@open-systems.com>
Co-authored-by: Joel Verezhak <jverezhak@open-systems.com>
Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com>
Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com>
Copy link
Member

@saswatamcode saswatamcode left a comment

Choose a reason for hiding this comment

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

LGTM!

@MichaHoffmann MichaHoffmann merged commit 36681af into release-0.39 Jul 21, 2025
27 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants