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

[7.13](backport #25778) [Filebeat] Mitigate deadlock in aws-s3 ACKHandler #25826

Merged
merged 1 commit into from
May 24, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 24, 2021

This is an automatic backport of pull request #25778 done by Mergify.
Cherry-pick of f0432df has failed:

On branch mergify/bp/7.13/pr-25778
Your branch is up to date with 'origin/7.13'.

You are currently cherry-picking commit f0432dfb5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   x-pack/filebeat/input/awss3/_meta/s3-input.asciidoc
	renamed:    x-pack/filebeat/input/awss3/ftest/sample1.txt -> x-pack/filebeat/input/awss3/testdata/sample1.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/input/awss3/collector.go
	added by them:   x-pack/filebeat/input/awss3/testdata/sample2.txt

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 24, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 24, 2021
@botelastic
Copy link

botelastic bot commented May 24, 2021

This pull request doesn't have a Team:<team> label.

* Rename ftest to conventional testdata

* Add missing encoder reader error check

* Use time.Duration to represent durations in code

* Mitigate deadlock in aws-s3

This is a small fix to stop the SQS keep-alive routing from returning when no error occurs while updating the visibility timeout.
I also made the error chan buffered (size 1) to allow the ACKHandler to unblock even if the channel receiver routine has exited.
There are still problems with the channel handling that need fixed, but IMO this should correct the most common cause.

Relates #25750

(cherry picked from commit f0432df)
@andrewkroh andrewkroh force-pushed the mergify/bp/7.13/pr-25778 branch from a5457d1 to 9d8bb81 Compare May 24, 2021 12:15
@elasticmachine
Copy link
Collaborator

elasticmachine commented May 24, 2021

💚 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 #25826 updated

  • Start Time: 2021-05-24T12:15:53.545+0000

  • Duration: 54 min 3 sec

  • Commit: 9d8bb81

Test stats 🧪

Test Results
Failed 0
Passed 6981
Skipped 1193
Total 8174

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6981
Skipped 1193
Total 8174

@andrewkroh andrewkroh merged commit 61fb037 into 7.13 May 24, 2021
@mergify mergify bot deleted the mergify/bp/7.13/pr-25778 branch May 24, 2021 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label v7.13.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants