winlogbeat: allow termination while attempting to open channels#35474
Merged
efd6 merged 1 commit intoelastic:mainfrom May 16, 2023
Merged
winlogbeat: allow termination while attempting to open channels#35474efd6 merged 1 commit intoelastic:mainfrom
efd6 merged 1 commit intoelastic:mainfrom
Conversation
Currently, if winlogbeat is attempting to open a channel that is not available because it is not found or there is a recoverable error, it will loop and retry. Since signals have been sent to notification handlers by this point, cancellation of the loop is not possible without agreement. So add a cancellation select at the head of the retry loop to allow termination.
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
💚 Flaky test reportTests succeeded. 🤖 GitHub commentsExpand to view the GitHub comments
To re-run your PR in the CI, just comment with:
|
Contributor
|
Pinging @elastic/security-external-integrations (Team:Security-External Integrations) |
taylor-swanson
approved these changes
May 16, 2023
mergify bot
pushed a commit
that referenced
this pull request
May 16, 2023
Currently, if winlogbeat is attempting to open a channel that is not available because it is not found or there is a recoverable error, it will loop and retry. Since signals have been sent to notification handlers by this point, cancellation of the loop is not possible without agreement. So add a cancellation select at the head of the retry loop to allow termination. (cherry picked from commit a927de0)
mergify bot
pushed a commit
that referenced
this pull request
May 16, 2023
Currently, if winlogbeat is attempting to open a channel that is not available because it is not found or there is a recoverable error, it will loop and retry. Since signals have been sent to notification handlers by this point, cancellation of the loop is not possible without agreement. So add a cancellation select at the head of the retry loop to allow termination. (cherry picked from commit a927de0)
This was referenced May 16, 2023
Merged
efd6
added a commit
that referenced
this pull request
May 16, 2023
… to open channels (#35491) * winlogbeat: allow termination while attempting to open channels (#35474) Currently, if winlogbeat is attempting to open a channel that is not available because it is not found or there is a recoverable error, it will loop and retry. Since signals have been sent to notification handlers by this point, cancellation of the loop is not possible without agreement. So add a cancellation select at the head of the retry loop to allow termination. (cherry picked from commit a927de0) * Update CHANGELOG.next.asciidoc --------- Co-authored-by: Dan Kortschak <90160302+efd6@users.noreply.github.com>
efd6
added a commit
that referenced
this pull request
May 16, 2023
… to open channels (#35492) * winlogbeat: allow termination while attempting to open channels (#35474) Currently, if winlogbeat is attempting to open a channel that is not available because it is not found or there is a recoverable error, it will loop and retry. Since signals have been sent to notification handlers by this point, cancellation of the loop is not possible without agreement. So add a cancellation select at the head of the retry loop to allow termination. (cherry picked from commit a927de0) * Update CHANGELOG.next.asciidoc --------- Co-authored-by: Dan Kortschak <90160302+efd6@users.noreply.github.com>
Contributor
|
Any idea if this same issue exists with filebeat and needs to be corrected? |
Contributor
|
@nicpenning, I took a look at the run loop for filebeat (winlog), and that one properly handles context cancellation. Looks like this issue only affected winlogbeat. |
3 tasks
Contributor
|
Thank you for being thorough! |
chrisberkhout
pushed a commit
that referenced
this pull request
Jun 1, 2023
Currently, if winlogbeat is attempting to open a channel that is not available because it is not found or there is a recoverable error, it will loop and retry. Since signals have been sent to notification handlers by this point, cancellation of the loop is not possible without agreement. So add a cancellation select at the head of the retry loop to allow termination.
6 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Currently, if winlogbeat is attempting to open a channel that is not available because it is not found or there is a recoverable error, it will loop and retry. Since signals have been sent to notification handlers by this point, cancellation of the loop is not possible without agreement. So add a cancellation select at the head of the retry loop to allow termination.
Why is it important?
The current behaviour requires heroic user intervention when attempting to bring down a running winlogbeat that has not been able to get its input channels.
Checklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.Author's Checklist
How to test this PR locally
Related issues
Use cases
Screenshots
Logs