diff options
author | David Rasch <rasch@raschnet.com> | 2012-07-24 20:05:18 -0400 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2012-07-24 18:30:03 -0700 |
commit | e2c06840c4c0a75a92d72304d74207968d2632fa (patch) | |
tree | 2597c1dbc9baf8adb456b6da7d32e02205c7e228 /lib/mogilefs/backend.rb | |
parent | 5cd52d27f6472e82809126cabb06af913ed0e358 (diff) | |
download | mogilefs-client-e2c06840c4c0a75a92d72304d74207968d2632fa.tar.gz |
* backend/do_request: when a request times out for a slow server, we now continue retries until we get a socket error, and close the connection afterward so we don't get interspersed responses * test: added a test for slow servers Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'lib/mogilefs/backend.rb')
-rw-r--r-- | lib/mogilefs/backend.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/mogilefs/backend.rb b/lib/mogilefs/backend.rb index f694623..cbeec3d 100644 --- a/lib/mogilefs/backend.rb +++ b/lib/mogilefs/backend.rb @@ -232,6 +232,7 @@ class MogileFS::Backend no_raise = args.delete(:ruby_no_raise) request = make_request(cmd, args) line = nil + failed = false @mutex.synchronize do begin io = dispatch_unlocked(request) @@ -249,7 +250,10 @@ class MogileFS::Backend MogileFS::InvalidResponseError, # truncated response MogileFS::Timeout # we got a successful timed_write, but not a timed_gets - retry if idempotent + if idempotent + failed = true + retry + end shutdown_unlocked(true) rescue # we DO NOT want the response we timed out waiting for, to crop up later @@ -257,6 +261,7 @@ class MogileFS::Backend # close the socket if there's any error. shutdown_unlocked(true) end while idempotent + shutdown_unlocked if failed end # @mutex.synchronize parse_response(line, no_raise ? request : nil) end |