Fix Timeout interrupt handling on Ruby 2.3 and protect Mysql2::Statement#execute #679
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
sodabrew
force-pushed
the
timeout_error
branch
5 times, most recently
from
c74e58a
to
c232699
Compare
|
This is causing Ruby 1.9.3 to sometimes segfault right after the execute is timed out, which is probably because 1.9.3 isn't actually protecting against the timeout (no Thread#handle_interrupt) and once the statement handle is invalid mysqlclient is fragile (as seen while debugging #673). I would solve this by actually skipping that test if Thread#handle_interrupt is not available and commenting about it. This is also causing Rubinius to segfault at the end of all of the tests, and I'm less sure of what's going on there. |
sodabrew
force-pushed
the
timeout_error
branch
from
4970d3f
to
470f8f8
Compare
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
sodabrew
force-pushed
the
timeout_error
branch
from
470f8f8
to
a4b0489
Compare
sodabrew
added a commit
that referenced
this pull request
Sep 14, 2015
Fix Timeout interrupt handling on Ruby 2.3 and protect Mysql2::Statement#execute
Merged
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.
Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions.
With thanks to @jeremy for PR #671 and @yui-knk for PR #677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.