Respect handle_interrupt for default SIGINT.#17533
Open
samuel-williams-shopify wants to merge 1 commit into
Open
Respect handle_interrupt for default SIGINT.#17533samuel-williams-shopify wants to merge 1 commit into
handle_interrupt for default SIGINT.#17533samuel-williams-shopify wants to merge 1 commit into
Conversation
77e26f0 to
c3d72bc
Compare
Contributor
Author
|
@nobu do you have any opinion about this? |
90f4758 to
7aaaabf
Compare
handle_interrupt for default SIGINT.
Default SIGINT delivery used rb_interrupt() directly, which could raise Interrupt inside Thread.handle_interrupt(SignalException => :never). This bypassed the pending interrupt queue used by Thread#raise and other default signal exceptions. Route default SIGINT through the pending interrupt queue while preserving the traditional no-message Interrupt. Add regression coverage for SIGINT and ruby/spec coverage showing default SIGINT and SIGTERM are maskable by Thread.handle_interrupt. [[Bug #22133]]
7aaaabf to
3c1705b
Compare
Contributor
Author
|
Possible downstream fix / workaround: socketry/async#459 |
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.
Default
SIGINTdelivery currently callsrb_interrupt()directly, so anInterruptcan be raised inside aThread.handle_interrupt(SignalException => :never)block. This bypasses the pending interrupt queue used byThread#raiseand other default signal exceptions.This PR adds a regression test using two
Thread::Queueinstances to coordinateProcess.kill(:INT, Process.pid), then changes the default SIGINT path to enqueue anInterrupton the main thread. This preserves the default exception class while allowingThread.handle_interruptto defer it consistently.Commits:
Tested with:
https://bugs.ruby-lang.org/issues/22133