Backport 3338 to the 5.2 branch #3364
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
harvesterCounter is accessed atomically and will fault on x86-32 or ARM if not 8-byte aligned. See golang/go#599 for more details on why it fails and https://golang.org/pkg/sync/atomic/#pkg-note-BUG for how putting the field first in the struct fixes it. (cherry picked from commit fd64af2)
(cherry picked from commit 03b70c3)
ruflin
reviewed
Jan 13, 2017
| @@ -30,7 +32,8 @@ type Prospector struct { | |||
| states *file.States | |||
| wg sync.WaitGroup | |||
| channelWg sync.WaitGroup // Separate waitgroup for channels as not stopped on completion | |||
| harvesterCounter uint64 | |||
| ID uint64 | |||
There was a problem hiding this comment.
I think this are backported by accident.
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
* Ensure harvesterCounter 8-byte alignment (elastic#3273) (elastic#3338) harvesterCounter is accessed atomically and will fault on x86-32 or ARM if not 8-byte aligned. See golang/go#599 for more details on why it fails and https://golang.org/pkg/sync/atomic/#pkg-note-BUG for how putting the field first in the struct fixes it. (cherry picked from commit f6f5e10) * Follow up with changelog for 3338 (elastic#3363) (cherry picked from commit 6af51cd)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #3338 and #3363.