Skip to content

Commit b8e6079

Browse files
tombrkatoulme
andauthored
[processor/deltatocumulative] don't copy xsync.MapOf (#39426)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description xsync.MapOf must not be copied at all, as internal pointer references become invalid otherwise. <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes #39106 #### Testing Hard to test in a non-flaky way as it depends on high concurrency, but verified using: ```go real := xsync.NewMapOf[int64, string]() copy := *real ch := make(chan int64, 256) go func() { for i := int64(0); i < math.MaxInt16; i++ { copy.LoadOrStore(i, "test") ch <- i } close(ch) }() for i := range ch { copy.LoadAndDelete(i) } ``` <!--Please delete paragraphs that you did not use before submitting.--> Co-authored-by: Antoine Toulme <[email protected]>
1 parent cc63942 commit b8e6079

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

.chloggen/xsync-ptr.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: deltatocumulative
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: fixes misuse of xsync, leading to bad mutex unlock
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [39106]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

processor/deltatocumulativeprocessor/internal/maps/map.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func Limit(limit int64) Context {
1515
}
1616

1717
func New[K comparable, V any](ctx Context) *Parallel[K, V] {
18-
return &Parallel[K, V]{ctx: ctx, elems: *xsync.NewMapOf[K, V]()}
18+
return &Parallel[K, V]{ctx: ctx, elems: xsync.NewMapOf[K, V]()}
1919
}
2020

2121
// lowercase alias for unexported embedding
@@ -32,7 +32,7 @@ type ctx = Context
3232
// Parallel enforces the [Context] size limit.
3333
type Parallel[K comparable, V any] struct {
3434
ctx
35-
elems xsync.MapOf[K, V]
35+
elems *xsync.MapOf[K, V]
3636
}
3737

3838
// Context holds size information about one or more maps.

0 commit comments

Comments
 (0)