Fix race on shared maps in global fields #6947
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
urso
force-pushed
the
fix-fields-overwrite
branch
from
da43b1b to
96c30fa
Compare
On publish fields are added to an event in this order: - local/global configured fields - dynamic fields - "beat" metadata When merging the fields, shared structures must not be overwritten or updated concurrently. This is enforced by cloning the original fields structure before applying updates. This adds missing Clone operations if configured fields add new fields to the `beat` namespace or if dynamic fields are enabled.
tsg
reviewed
May 3, 2018
| @@ -53,7 +53,8 @@ func newProcessorPipeline( | |||
| localProcessors = makeClientProcessors(config) | |||
| ) | |||
|
|
|||
| needsCopy := global.alwaysCopy || localProcessors != nil || global.processors != nil | |||
| // needsCopy := global.alwaysCopy || localProcessors != nil || global.processors != nil | |||
| needsCopy := true | |||
There was a problem hiding this comment.
This looks weird. Is the intention to always copy? Or can the needsCopy value change to false in other parts of the code?
urso
added
v6.2.5
and removed
needs_backport
urso
pushed a commit
to urso/beats
that referenced
this pull request
May 3, 2018
* Fix race on shared maps in global fields On publish fields are added to an event in this order: - local/global configured fields - dynamic fields - "beat" metadata When merging the fields, shared structures must not be overwritten or updated concurrently. This is enforced by cloning the original fields structure before applying updates. This adds missing Clone operations if configured fields add new fields to the `beat` namespace or if dynamic fields are enabled. * Remove hard coded bool from testing (cherry picked from commit ffa812b)
urso
pushed a commit
to urso/beats
that referenced
this pull request
May 3, 2018
* Fix race on shared maps in global fields On publish fields are added to an event in this order: - local/global configured fields - dynamic fields - "beat" metadata When merging the fields, shared structures must not be overwritten or updated concurrently. This is enforced by cloning the original fields structure before applying updates. This adds missing Clone operations if configured fields add new fields to the `beat` namespace or if dynamic fields are enabled. * Remove hard coded bool from testing (cherry picked from commit ffa812b)
ruflin
pushed a commit
that referenced
this pull request
May 4, 2018
* Fix race on shared maps in global fields On publish fields are added to an event in this order: - local/global configured fields - dynamic fields - "beat" metadata When merging the fields, shared structures must not be overwritten or updated concurrently. This is enforced by cloning the original fields structure before applying updates. This adds missing Clone operations if configured fields add new fields to the `beat` namespace or if dynamic fields are enabled. * Remove hard coded bool from testing (cherry picked from commit ffa812b)
ruflin
pushed a commit
that referenced
this pull request
May 4, 2018
* Fix race on shared maps in global fields On publish fields are added to an event in this order: - local/global configured fields - dynamic fields - "beat" metadata When merging the fields, shared structures must not be overwritten or updated concurrently. This is enforced by cloning the original fields structure before applying updates. This adds missing Clone operations if configured fields add new fields to the `beat` namespace or if dynamic fields are enabled. * Remove hard coded bool from testing (cherry picked from commit ffa812b)
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
* Fix race on shared maps in global fields On publish fields are added to an event in this order: - local/global configured fields - dynamic fields - "beat" metadata When merging the fields, shared structures must not be overwritten or updated concurrently. This is enforced by cloning the original fields structure before applying updates. This adds missing Clone operations if configured fields add new fields to the `beat` namespace or if dynamic fields are enabled. * Remove hard coded bool from testing (cherry picked from commit 7166823)
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
* Fix race on shared maps in global fields On publish fields are added to an event in this order: - local/global configured fields - dynamic fields - "beat" metadata When merging the fields, shared structures must not be overwritten or updated concurrently. This is enforced by cloning the original fields structure before applying updates. This adds missing Clone operations if configured fields add new fields to the `beat` namespace or if dynamic fields are enabled. * Remove hard coded bool from testing (cherry picked from commit 7166823)
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.
On publish fields are added to an event in this order:
When merging the fields, shared structures must not be overwritten or
updated concurrently. This is enforced by cloning the original fields
structure before applying updates.
This adds missing Clone operations if configured fields add new
fields to the
beatnamespace or if dynamic fields are enabled.The dynamic fields support has been changed to dynamically test if a clone is required or not.