redis-sentinel 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a79a501844ac25c4bdde61c4801a75e65d22bd0d
-  data.tar.gz: f40c099446f5b31cc8558aaacb06f8e325381d5f
+  metadata.gz: 89f65c37fc86df6375c442c0f8aad24eb6d02b7e
+  data.tar.gz: 77ed5c965346ca00f5ce1aec7d30e5a2109ebf7a
 SHA512:
-  metadata.gz: 83f3892eacb138abf90d169bb452dc59ff46d91cc25f2581c1278cbf48e026ccc16006db28d92b7041d8c8ce2d2331876619567e1287e713eb3910c27ec70596
-  data.tar.gz: 90c948ebe4d6bfa1a8a105d79d6e9569cd88cc63988f02c961c11a03f2c3450b63a02de33f6d38bfc1fef71e3b38ce14860f9219dc041bc6424a9a93d316d77e
+  metadata.gz: e486e2b913b004c0ed6fd09c6d80ca905e3f6026d27c523115f9b08895356e761a0def2ecc551a799b554e3a3fe558e3580246e3cc07f7aec0564ff9582ff2de
+  data.tar.gz: 60f1261aff29cf43b2304efb67606e1d631e28a1a711f2b71683d86566845981bc2b86581d66cb528dcba170d4ccd8868ee9ada163dbeb257cab6a33d395a322

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.4.3
+
+* Fix for pipelined requests and readonly calls
+
 ## 1.4.2
 
 * Fix sentinel reconnection broken

data/lib/redis-sentinel/client.rb

@@ -82,7 +82,7 @@ class Redis::Client
         rescue Redis::CommandError => e
           raise unless e.message.include?("IDONTKNOW")
         rescue Redis::CannotConnectError
-          # faile to connect to current sentinel server
+          # failed to connect to current sentinel server
         end
       end
     end
@@ -96,21 +96,33 @@ class Redis::Client
     alias disconnect disconnect_with_sentinels
 
     def call_with_readonly_protection(*args, &block)
-      tries = 0
-      call_without_readonly_protection(*args, &block)
-    rescue Redis::CommandError => e
-      if e.message == "READONLY You can't write against a read only slave."
-        reconnect
-        retry if (tries += 1) < 4
-      else
-        raise
-      end
+      readonly_protection_with_timeout(:call_without_readonly_protection, *args, &block)
     end
 
     alias call_without_readonly_protection call
     alias call call_with_readonly_protection
 
+    def call_pipeline_with_readonly_protection(*args, &block)
+      readonly_protection_with_timeout(:call_pipeline_without_readonly_protection, *args, &block)
+    end
+
+    alias call_pipeline_without_readonly_protection call_pipeline
+    alias call_pipeline call_pipeline_with_readonly_protection
+
   private
+    def readonly_protection_with_timeout(method, *args, &block)
+      deadline = @failover_reconnect_timeout.to_i + Time.now.to_f
+      send(method, *args, &block)
+    rescue Redis::CommandError => e
+      if e.message.include? "READONLY You can't write against a read only slave."
+        raise if Time.now.to_f > deadline
+        sleep @failover_reconnect_wait
+        reconnect
+        retry
+      else
+        raise
+      end
+    end
 
     def fetch_option(options, key)
       options.delete(key) || options.delete(key.to_s)

data/lib/redis-sentinel/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module Sentinel
-    VERSION = "1.4.2"
+    VERSION = "1.4.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-sentinel
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis