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

[filebeat][gcs] - Added missing locks for safe concurrency #34914

Merged
merged 10 commits into from
Mar 31, 2023
Merged

[filebeat][gcs] - Added missing locks for safe concurrency #34914

merged 10 commits into from
Mar 31, 2023

Conversation

ShourieG
Copy link
Contributor

Type of change

  • Bug

What does this PR do?

Adds safety mutex locks on state maps in some methods which were missing it.

Why is it important?

Some users faced concurrency issue with multiple workers, which raised this issue.

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.

Related issues

@ShourieG ShourieG requested a review from a team as a code owner March 23, 2023 20:04
@ShourieG ShourieG requested review from rdner and cmacknz and removed request for a team March 23, 2023 20:04
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 23, 2023
@ShourieG ShourieG self-assigned this Mar 23, 2023
@mergify
Copy link
Contributor

mergify bot commented Mar 23, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @ShourieG? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 23, 2023
@ShourieG ShourieG requested review from P1llus, a team and efd6 March 23, 2023 20:05
@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 23, 2023 •
edited by jenkins-beats-ci bot
Loading

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2023-03-30T11:18:02.695+0000

  • Duration: 74 min 35 sec

Test stats 🧪

Test Results
Failed 0
Passed 2875
Skipped 173
Total 3048

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@ShourieG
Copy link
Contributor Author

@efd6, updated this PR as suggested with the relevant fixes.

efd6
efd6 approved these changes Mar 27, 2023
View reviewed changes
Copy link
Contributor

@efd6 efd6 left a comment •
edited by rdner
Loading

Choose a reason for hiding this comment

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

The packaging failure appears to be due to stale jessie. This will be fixed with #34921.

rdner
rdner approved these changes Mar 28, 2023
View reviewed changes
Copy link
Member

@rdner rdner left a comment

Choose a reason for hiding this comment

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

The fix for the packaging job is merged, ship it :)

@mergify
Copy link
Contributor

mergify bot commented Mar 30, 2023

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b gcs/concurrency_fix upstream/gcs/concurrency_fix
git merge upstream/main
git push upstream gcs/concurrency_fix

@ShourieG ShourieG merged commit 62a2700 into elastic:main Mar 31, 2023
mergify bot pushed a commit that referenced this pull request Mar 31, 2023
@ShourieG @mergify
[filebeat][gcs] - Added missing locks for safe concurrency (#34914)
97a510a 
* added missing locks for safe concurrency

* updated asciidoc

* updated asciidoc

* updated locks for publishing events

* added nil state fail safe mechanism

---------

Co-authored-by: Denis <[email protected]>
(cherry picked from commit 62a2700)
@mergify mergify bot mentioned this pull request Mar 31, 2023
Merged
ShourieG added a commit that referenced this pull request Mar 31, 2023
@mergify @ShourieG
[8.7](backport #34914) [filebeat][gcs] - Added missing locks for safe…
1c93cd6 
… concurrency (#34986)

* [filebeat][gcs] - Added missing locks for safe concurrency (#34914)

* added missing locks for safe concurrency

* updated asciidoc

* updated asciidoc

* updated locks for publishing events

* added nil state fail safe mechanism

---------

Co-authored-by: Denis <[email protected]>
(cherry picked from commit 62a2700)

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: ShourieG <[email protected]>
chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
@ShourieG @rdner @chrisberkhout
[filebeat][gcs] - Added missing locks for safe concurrency (#34914)
cf74871 
* added missing locks for safe concurrency

* updated asciidoc

* updated asciidoc

* updated locks for publishing events

* added nil state fail safe mechanism

---------

Co-authored-by: Denis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rdner rdner rdner approved these changes

@P1llus P1llus P1llus approved these changes

@efd6 efd6 efd6 approved these changes

@cmacknz cmacknz Awaiting requested review from cmacknz cmacknz was automatically assigned from elastic/elastic-agent-data-plane

Assignees

@ShourieG ShourieG

Labels
backport-v8.7.0 Automated backport with mergify bugfix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ShourieG @elasticmachine @rdner @P1llus @efd6