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