From: Eric Wong <e@80x24.org>
To: mogilefs-client-public@bogomips.org
Subject: [PATCH] socket_common: improve readability of case statement
Date: Thu, 23 Mar 2017 01:40:48 +0000 [thread overview]
Message-ID: <20170323014048.GA31131@starla> (raw)
In-Reply-To: <20170313192845.667-1-e@80x24.org>
Due to the release of Ruby 2.4.1 with the necessary fix,
it seems likely that future releases (if any) of the 2.2
and 2.3 series will avoid garbage on IO#write, too.
---
lib/mogilefs/socket_common.rb | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/mogilefs/socket_common.rb b/lib/mogilefs/socket_common.rb
index ec9249f..53771c8 100644
--- a/lib/mogilefs/socket_common.rb
+++ b/lib/mogilefs/socket_common.rb
@@ -59,16 +59,21 @@ 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.4.1 and Ruby 2.5
+ # and it is fixed in Ruby 2.4.1+
# 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' &&
- 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.
- timed_write(buf, 86400)
+ case RUBY_VERSION
+ when '2.0.0',
+ '2.1.0'..'2.1.9',
+ # we expect 2.2.7 and 2.3.4 to not need this
+ '2.2.0'..'2.2.6',
+ '2.3.0'..'2.3.3',
+ '2.4.0' # 2.4.1 is good!
+ 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.
+ timed_write(buf, 86400)
+ end
end
end
end
--
EW
prev parent reply other threads:[~2017-03-23 1:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-13 19:28 [PATCH] socket_common: limit garbage workaround to Ruby <= 2.4.1 Eric Wong
2017-03-23 0:29 ` Eric Wong
2017-03-23 1:40 ` Eric Wong [this message]
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=20170323014048.GA31131@starla \
--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).