-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
x-pack/filebeat/input/cel: fix handling of cancellation #33968
Merged
Merged
Conversation
This file contains 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
efd6
added
bug
Filebeat
Filebeat
Team:Security-External Integrations
8.7-candidate
backport-v8.6.0
Automated backport with mergify
labels
Dec 6, 2022
botelastic
bot
added
needs_team
Indicates that the issue/PR needs a Team:* label
and removed
needs_team
Indicates that the issue/PR needs a Team:* label
labels
Dec 6, 2022
Pinging @elastic/security-external-integrations (Team:Security-External Integrations) |
Collaborator
Currently, the HTTP client requests do not make use of context.Context so cancellation errors are swallowed without being handed back to the cel event loop, resulting in inability to cancel the input. So check for cancellation at the start of each event loop iteration unconditionally. The mito/lib.HTTP extension will also be altered to include context passing, but this is an optimisation that will reduce delay between SIGINT and event loop cancellation rather than correctness of the cancellation logic.
Kudos, SonarCloud Quality Gate passed! |
andrewkroh
approved these changes
Dec 7, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
mergify bot
pushed a commit
that referenced
this pull request
Dec 7, 2022
Currently, the HTTP client requests do not make use of context.Context so cancellation errors are swallowed without being handed back to the cel event loop, resulting in inability to cancel the input. So check for cancellation at the start of each event loop iteration unconditionally. The mito/lib.HTTP extension will also be altered to include context passing, but this is an optimisation that will reduce delay between SIGINT and event loop cancellation rather than correctness of the cancellation logic. (cherry picked from commit 4bb0e13)
efd6
added a commit
that referenced
this pull request
Dec 7, 2022
) Currently, the HTTP client requests do not make use of context.Context so cancellation errors are swallowed without being handed back to the cel event loop, resulting in inability to cancel the input. So check for cancellation at the start of each event loop iteration unconditionally. The mito/lib.HTTP extension will also be altered to include context passing, but this is an optimisation that will reduce delay between SIGINT and event loop cancellation rather than correctness of the cancellation logic. (cherry picked from commit 4bb0e13) Co-authored-by: Dan Kortschak <90160302+efd6@users.noreply.github.com>
chrisberkhout
pushed a commit
that referenced
this pull request
Jun 1, 2023
Currently, the HTTP client requests do not make use of context.Context so cancellation errors are swallowed without being handed back to the cel event loop, resulting in inability to cancel the input. So check for cancellation at the start of each event loop iteration unconditionally. The mito/lib.HTTP extension will also be altered to include context passing, but this is an optimisation that will reduce delay between SIGINT and event loop cancellation rather than correctness of the cancellation logic.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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, the HTTP client requests do not make use of context.Context so cancellation errors are swallowed without being handed back to the cel event loop, resulting in inability to cancel the input. So check for cancellation at the start of each event loop iteration unconditionally. The mito/lib.HTTP extension will also be altered to include context passing, but this is an optimisation that will reduce delay between SIGINT and event loop cancellation rather than correctness of the cancellation logic.
Why is it important?
Currently cannot cancel running filebeat with a CEL input that is blocked in an HTTP request.
Checklist
CHANGELOG.next.asciidoc
orCHANGELOG-developer.next.asciidoc
.Author's Checklist
How to test this PR locally
Related issues
Use cases
Screenshots
Logs