diff options
| -rw-r--r-- | lib/mogilefs/backend.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/mogilefs/backend.rb b/lib/mogilefs/backend.rb index b0d2f5b..8b9dc6d 100644 --- a/lib/mogilefs/backend.rb +++ b/lib/mogilefs/backend.rb @@ -181,12 +181,20 @@ class MogileFS::Backend idempotent or raise EOFError, "end of file reached after: #{request.inspect}" - rescue + rescue SystemCallError, + MogileFS::UnreadableSocketError, + MogileFS::InvalidResponseError, # truncated response + MogileFS::Timeout + # we got a successful timed_write, but not a timed_gets + retry if idempotent + shutdown_unlocked + raise + rescue => err # we DO NOT want the response we timed out waiting for, to crop up later # on, on the same socket, intersperesed with a subsequent request! we # close the socket if there's any error. shutdown_unlocked - idempotent or raise + raise end while idempotent end # @mutex.synchronize end @@ -238,7 +246,7 @@ class MogileFS::Backend addr, port = host.split(/:/) @socket = MogileFS::Socket.tcp(addr, port, @timeout) @active_host = host - rescue SystemCallError, MogileFS::Timeout + rescue SystemCallError, MogileFS::Timeout => err @dead[host] = now next end |