[9.4] (backport #19017) fix forced-shutdown (double SIGINT) behaviour for JRuby 10#19034
Merged
Conversation
(cherry picked from commit 296f936)
Contributor
🤖 GitHub commentsJust comment with:
|
2 tasks
💚 Build Succeeded
cc @yaauie |
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
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.
Release notes
[rn:skip]
What does this PR do?
Fixes an issue introduced with the upgrade to JRuby 10 in which a doubled-
SIGINTdoes not force an immediate shutdown because theSystemExitexception is caught and squashed by the default thread exception handler.Why is it important/What is the impact to the user?
Sometimes our users need to force Logstash to shut down before it has finished processing the events in-flight. The upgrade to JRuby10 inadvertently removed this functionality, and we restore it here.
Checklist
[ ] 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 (and/or docker env variables)How to test this PR locally
SIGINTsignals (CTRL+Cin most shells)SIGINT.(without this patch, Logstash keeps processing until the in-flight events are done)
Related issues
Caused by: #18755
Logs
Without (note how it keeps executing after logging "Terminating Immediately"):
With (note how it actually terminates immediately after logging "Terminating Immediately"):
This is an automatic backport of pull request #19017 done by [Mergify](https://mergify.com).