-
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
packetbeat/sniffer: fix shutdown logic #33979
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
Packetbeat
Team:Security-External Integrations
8.7-candidate
backport-v8.6.0
Automated backport with mergify
labels
Dec 7, 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 7, 2022
This simplifies the shutdown logic and ensures that blocking calls all receive the signal to terminate when the Sniffer Stop method has been called. Previously, the sniffer done chan was not shared, meaning that it was not closed and would not have had any effect if it were. The context that was being passed around was not a cancellation context and so never had a chance to terminate sniffHandle.
efd6
force-pushed
the
33962-packetbeat
branch
from
December 7, 2022 06:22
1044560
to
19a4298
Compare
Pinging @elastic/security-external-integrations (Team:Security-External Integrations) |
Please retry analysis of this Pull-Request directly on SonarCloud. |
ShourieG
approved these changes
Dec 12, 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 12, 2022
This simplifies the shutdown logic and ensures that blocking calls all receive the signal to terminate when the Sniffer Stop method has been called. Previously, the sniffer done chan was not shared, meaning that it was not closed and would not have had any effect if it were. The context that was being passed around was not a cancellation context and so never had a chance to terminate sniffHandle. (cherry picked from commit a4fdbac)
efd6
added a commit
that referenced
this pull request
Dec 12, 2022
This simplifies the shutdown logic and ensures that blocking calls all receive the signal to terminate when the Sniffer Stop method has been called. Previously, the sniffer done chan was not shared, meaning that it was not closed and would not have had any effect if it were. The context that was being passed around was not a cancellation context and so never had a chance to terminate sniffHandle. (cherry picked from commit a4fdbac) Co-authored-by: Dan Kortschak <90160302+efd6@users.noreply.github.com>
chrisberkhout
pushed a commit
that referenced
this pull request
Jun 1, 2023
This simplifies the shutdown logic and ensures that blocking calls all receive the signal to terminate when the Sniffer Stop method has been called. Previously, the sniffer done chan was not shared, meaning that it was not closed and would not have had any effect if it were. The context that was being passed around was not a cancellation context and so never had a chance to terminate sniffHandle.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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?
This simplifies the shutdown logic and ensures that blocking calls all receive the signal to terminate when the Sniffer Stop method has been called.
Previously, the sniffer done chan was not shared, meaning that it was not closed and would not have had any effect if it were. The context that was being passed around was not a cancellation context and so never had a chance to terminate sniffHandle.
Why is it important?
The current behaviour does not allow correct termination of the beat.
Checklist
CHANGELOG.next.asciidoc
orCHANGELOG-developer.next.asciidoc
.Author's Checklist
*sniffer.state
and thectx
parameter.How to test this PR locally
Related issues
Use cases
Screenshots
Logs