Fix interrupt handling in synchronize#6527
Merged
headius merged 1 commit intojruby:jruby-9.2from Jan 13, 2021
Merged
Conversation
The logic in MonitorMixin#mon_synchronize is broken as described in ruby/monitor#2 due to the improper use of handle_interrupt. This patch fixes the issue by ensuring the entire body of the method is protected from interrupts except for the yield to the incoming block. This avoids the ensure being interrupted, leaving the monitor locked. Fixes jruby#6526
headius
added a commit
to headius/jruby
that referenced
this pull request
Jan 14, 2021
This mimics the change in CRuby 2.7 from this PR: ruby/ruby#2576 This makes the fixes from jruby#6527 and ruby/monitor#2 irrelevant due to the lack of Ruby interrupts in native code.
Merged
headius
added a commit
to headius/jruby
that referenced
this pull request
Jan 14, 2021
This mimics the change in CRuby 2.7 from this PR: ruby/ruby#2576 This makes the fixes from jruby#6527 and ruby/monitor#2 irrelevant due to the lack of Ruby interrupts in native code.
headius
added a commit
to headius/jruby
that referenced
this pull request
Jan 14, 2021
This mimics the change in CRuby 2.7 from this PR: ruby/ruby#2576 This makes the fixes from jruby#6527 and ruby/monitor#2 irrelevant due to the lack of Ruby interrupts in native code.
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
1 participant
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.
The logic in MonitorMixin#mon_synchronize is broken as described
in ruby/monitor#2 due to the improper use of handle_interrupt.
This patch fixes the issue by ensuring the entire body of the
method is protected from interrupts except for the yield to the
incoming block. This avoids the ensure being interrupted, leaving
the monitor locked.
Fixes #6526