From: Eric Wong <e@80x24.org>
To: mogilefs-client-public@bogomips.org
Subject: [PATCH] socket_common: limit garbage workaround to Ruby <= 2.4.1
Date: Mon, 13 Mar 2017 19:28:45 +0000 [thread overview]
Message-ID: <20170313192845.667-1-e@80x24.org> (raw)
It looks like Ruby 2.4.1 will have the regression fixed
backported to it:
https://bugs.ruby-lang.org/issues/13299#change-63503
The next releases of Ruby 2.3 and 2.2 may, too; at the
branch maintainer's decision.
---
lib/mogilefs/socket_common.rb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/mogilefs/socket_common.rb b/lib/mogilefs/socket_common.rb
index 212f5da..e35ae03 100644
--- a/lib/mogilefs/socket_common.rb
+++ b/lib/mogilefs/socket_common.rb
@@ -59,9 +59,12 @@ def readpartial(size, buf = "", timeout = 5)
# Workaround for https://bugs.ruby-lang.org/issues/13085
# (excessive garbage from IO#write)
# This regression was introduced in Ruby 2.0 (r34847)
- # and looks like it will be fixed in Ruby 2.5 final.
+ # and looks like it will be fixed in Ruby 2.4.1 and Ruby 2.5
+ # backport request: https://bugs.ruby-lang.org/issues/13299
+ rvn = RUBY_VERSION.split('.'.freeze).map(&:to_i) # "2.4.1" => [ 2, 4, 1 ]
if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' &&
- RUBY_VERSION.to_f >= 2.0 && RUBY_VERSION.to_f <= 2.4
+ rvn[0] >= 2 &&
+ ((rvn[1] == 4 && rvn[2] == 0) || (rvn[1] < 4))
def write(buf)
# Blocking TCP writes would error out long before one day,
# and MogileFS won't allow file creations which take over a day.
--
EW
next reply other threads:[~2017-03-13 19:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-13 19:28 Eric Wong [this message]
2017-03-23 0:29 ` [PATCH] socket_common: limit garbage workaround to Ruby <= 2.4.1 Eric Wong
2017-03-23 1:40 ` [PATCH] socket_common: improve readability of case statement Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/mogilefs-client/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170313192845.667-1-e@80x24.org \
--to=e@80x24.org \
--cc=mogilefs-client-public@bogomips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/mogilefs-client.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).