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

x-pack/filebeat/input/cel: fix handling of cancellation #33968

Merged
merged 1 commit into from
Dec 7, 2022

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Dec 6, 2022

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

  • 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 — manually checked.
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 self-assigned this Dec 6, 2022
@botelastic 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
@efd6 efd6 requested a review from andrewkroh December 6, 2022 22:27
@efd6 efd6 marked this pull request as ready for review December 6, 2022 22:29
@efd6 efd6 requested a review from a team as a code owner December 6, 2022 22:29
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 6, 2022

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-12-07T01:09:52.668+0000

  • Duration: 75 min 55 sec

Test stats 🧪

Test Results
Failed 0
Passed 2514
Skipped 167
Total 2681

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

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.
@sonarqubecloud
Copy link

sonarqubecloud bot commented Dec 7, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@efd6 efd6 merged commit 4bb0e13 into elastic:main Dec 7, 2022
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
8.7-candidate backport-v8.6.0 Automated backport with mergify bug Filebeat Filebeat
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Filebeat] cel input does not stop after SIGINT
3 participants