Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-pick #21690 to 7.10: Fix concurrent map read and write in socket dataset #21730

Merged
merged 1 commit into from
Oct 13, 2020
Merged

Cherry-pick #21690 to 7.10: Fix concurrent map read and write in socket dataset #21730

merged 1 commit into from
Oct 13, 2020

Conversation

adriansr
Copy link
Contributor

@adriansr adriansr commented Oct 12, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #21690 to 7.10 branch. Original message:

What does this PR do?

Fixes a panic caused by a concurrent map read and write in Auditbeat's system/socket dataset.

Why is it important?

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test this PR locally

Without synchronization, the provided test fails:

go test -race -test.v -test.run TestProcessDNSRace

Related issues

Closes #21192

@adriansr
Fix concurrent map read and write in socket dataset (elastic#21690)
18fd7c3 
This fixes a panic caused by a concurrent map read and write in Auditbeat's
system/socket dataset.

Fixes elastic#21192

(cherry picked from commit 9ab0a91)
@adriansr adriansr requested a review from a team as a code owner October 12, 2020 22:50
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 12, 2020
@adriansr adriansr requested a review from a team October 12, 2020 22:50
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21730 opened]

  • Start Time: 2020-10-12T22:50:49.559+0000

  • Duration: 47 min 13 sec

Test stats 🧪

Test Results
Failed 0
Passed 228
Skipped 33
Total 261

andrewkroh
andrewkroh approved these changes Oct 13, 2020
View reviewed changes
Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

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

LGTM. The one red beats-ci status check is coming from the old CI job so it's safe to ignore. It's being disabled.

@adriansr adriansr merged commit 0c73fa2 into elastic:7.10 Oct 13, 2020
@zube zube bot removed the [zube]: Done label Jan 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewkroh andrewkroh andrewkroh approved these changes

Assignees
No one assigned
Labels
backport review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adriansr @elasticmachine @andrewkroh