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

[8.16](backport #41960) Add upstream deadlock warning to the logstash output #42110

Open
wants to merge 2 commits into
base: 8.16
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2024

Add an internal timeout in the Logstash output so that it logs an error when published events stop making progress for an extended time, which can indicate that the Logstash host is silently deadlocked.

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


This is an automatic backport of pull request #41960 done by [Mergify](https://mergify.com).

Add an internal timeout in the Logstash output so that it logs an error when published events stop making progress for an extended time, which can indicate that the Logstash host is silently deadlocked.

(cherry picked from commit 0e62bf8)

# Conflicts:
#	libbeat/outputs/logstash/async.go
@mergify mergify bot requested a review from a team as a code owner December 18, 2024 16:04
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 18, 2024
@mergify mergify bot requested review from khushijain21 and VihasMakwana and removed request for a team December 18, 2024 16:04
@mergify mergify bot assigned faec Dec 18, 2024
Copy link
Contributor Author

mergify bot commented Dec 18, 2024

Cherry-pick of 0e62bf8 has failed:

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

You are currently cherry-picking commit 0e62bf8f0.
  (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:
	new file:   libbeat/outputs/logstash/deadlock.go
	new file:   libbeat/outputs/logstash/deadlock_test.go
	modified:   libbeat/outputs/logstash/sync.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/outputs/logstash/async.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 18, 2024
@botelastic
Copy link

botelastic bot commented Dec 18, 2024

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

Copy link
Contributor Author

mergify bot commented Dec 23, 2024

This pull request has not been merged yet. Could you please review and merge it @faec? 🙏

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant