Skip to content

Conversation

devanbenz
Copy link

@devanbenz devanbenz commented May 9, 2025

* fix: lock MeasurementFields while validating (#25998)

There was a window where a race between writes with
differing types for the same field were being validated.
Lock the  MeasurementFields struct during field
validation to avoid this.

closes #23756

(cherry picked from commit 5a20a83)

helps #26001

* fix: switch MeasurementFields from atomic.Value to sync.Map (#26022)

Simplify and speed up synchronization for
MeasurementFields structures by switching
from a mutex and atomic.Value to a sync.Map

(cherry picked from commit b617eb2)

closes #26001

(cherry picked from commit 8711e2d)
@devanbenz devanbenz added area/2.x OSS 2.0 related issues and PRs team/edge labels May 9, 2025
@devanbenz devanbenz changed the title feat: check for uncommitted WRR segments during startup (#25560) fix: prevent differing field types in the same shard (#26025) May 9, 2025
@devanbenz devanbenz requested a review from davidby-influx May 12, 2025 13:42
Copy link
Contributor

@davidby-influx davidby-influx left a comment

Choose a reason for hiding this comment

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

LGTM

@devanbenz devanbenz merged commit eb1dd04 into 2.7 May 12, 2025
24 of 25 checks passed
@devanbenz devanbenz deleted the db/cherrypick_diff_shard branch May 12, 2025 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/tsm area/2.x OSS 2.0 related issues and PRs kind/bug team/edge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mismatched field type within shard causes panic [Port to main-2.x] [port to 2.7]
2 participants