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.

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

Cherry-pick #21380 to 7.9: [filebeat] Fix shutdown tracking in s3 input #21397

Merged
merged 1 commit into from
Sep 30, 2020

Conversation

faec
Copy link
Contributor

@faec faec commented Sep 29, 2020

Cherry-pick of PR #21380 to 7.9 branch. Original message:

This is just a short fix -- the s3 input's wait group (used to wait for shutdown) currently calls wg.Done() immediately after the (asynchronous) call site, so the wg.Wait() on shutdown is always a no-op. This PR moves the wg.Done() call to the end of the worker goroutine, which is probably what was intended.

@faec faec added [zube]: In Review backport Team:Integrations Label for the Integrations team labels Sep 29, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 29, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 29, 2020
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21397 opened]

  • Start Time: 2020-09-29T17:08:42.781+0000

  • Duration: 56 min 18 sec

Test stats 🧪

Test Results
Failed 0
Passed 1896
Skipped 257
Total 2153

@faec faec merged commit fc268ed into elastic:7.9 Sep 30, 2020
@faec faec deleted the backport_21380_7.9 branch September 30, 2020 14:44
@zube zube bot removed the [zube]: Done label Dec 30, 2020
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants