From a37a40ae2eed07439e23e3f4366816576ab801c9 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sun, 13 Nov 2011 07:47:16 +0000
Subject: [PATCH] socket: alias write to timed_write

All of our writes must respect timeouts.
Return value must be the number bytes written.
---
 lib/mogilefs/socket/kgio.rb      | 4 +++-
 lib/mogilefs/socket/pure_ruby.rb | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/mogilefs/socket/kgio.rb b/lib/mogilefs/socket/kgio.rb
index 292ea7e..63f9c0b 100644
--- a/lib/mogilefs/socket/kgio.rb
+++ b/lib/mogilefs/socket/kgio.rb
@@ -47,7 +47,9 @@ class MogileFS::Socket < Kgio::Socket
       written += expect - rc.bytesize
       buf = rc
     else
-      return rc
+      return expect
     end while true
   end
+
+  alias write timed_write
 end
diff --git a/lib/mogilefs/socket/pure_ruby.rb b/lib/mogilefs/socket/pure_ruby.rb
index 24d576a..fa386cd 100644
--- a/lib/mogilefs/socket/pure_ruby.rb
+++ b/lib/mogilefs/socket/pure_ruby.rb
@@ -49,7 +49,7 @@ class MogileFS::Socket < Socket
     expect = buf.bytesize
     begin
       rc = write_nonblock(buf)
-      return if rc == buf.bytesize
+      return expect if rc == buf.bytesize
       written += rc
 
       if buf.respond_to?(:byteslice)
@@ -65,4 +65,6 @@ class MogileFS::Socket < Socket
         request_truncated!(written, expect)
     end while true
   end
+
+  alias write timed_write
 end
-- 
2.11.4.GIT