redis-cluster 1.0.0.pre.rc.3 → 1.0.0.pre.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4fb30f11cb1d74b3572c8e0c9ea64ff534da5c4
-  data.tar.gz: 08f644a16dc2155ea730e16170b40d72f2019511
+  metadata.gz: ae1424cf66cf0843a3300a70bf4dd23ce9699c56
+  data.tar.gz: 898602e4c11a4267da6d7d427d57da29ae161eba
 SHA512:
-  metadata.gz: 105c1a258630a397d8f51a259a356751efcf6d67cb68484b73e4f0fa230d05d896c5970298840961bbe472232a2d2f986e71f28841d2fbaa21628ccdc07b9149
-  data.tar.gz: ae7fa4048759d265ba68c6c21ba18acba1918a407f4c7879a4b18494a0595293a64ea84967add9d19b7a1f57ad7d3999bd4b407ec33ae1b6a249d2d60289d70c
+  metadata.gz: f2748d2afac09200212d8141f4c8ad8568e3038a8da78bc0d0128be05c99280c24e7ba7336daea7daf80a49cf2f942353c5432c0986c091b2f266e226d6a02ff
+  data.tar.gz: fa34f1114adc201170ee71c54f77c19624dc1bad37ad82cb83eed2500ed86bc0f42a6c086fd2b2281482dab94ac27656f886a29e6fced351d2215b0b68e784cb

data/lib/redis-cluster.rb

@@ -91,8 +91,8 @@ class RedisCluster
 
           @pipeline = []
           mapped_future.each do |url, futures|
-            leftover, move = do_pipelined(url, futures)
-            moved ||= move
+            leftover, error = do_pipelined(url, futures)
+            moved ||= (error == :moved || error == :down)
 
             @pipeline.concat(leftover)
           end
@@ -134,9 +134,11 @@ class RedisCluster
         cluster.reset if err == :moved
         asking = err == :ask
         client = cluster[url]
-      rescue Redis::CannotConnectError => e
-        asking = false
-        cluster.reset
+      rescue LoadingStateError, Redis::CannotConnectError => e
+        if e.is_a?(Redis::CannotConnectError)
+          asking = false
+          cluster.reset
+        end
         client = cluster.client_for(mode, slot)
         reply = e
       end
@@ -162,7 +164,7 @@ class RedisCluster
   end
 
   def do_pipelined(url, futures)
-    moved = false
+    error = nil
     leftover = []
 
     rev_index = {}
@@ -189,18 +191,18 @@ class RedisCluster
       err, url = scan_reply(reply)
       next unless err
 
-      moved ||= err == :moved
+      error ||= :moved if err == :moved
       future.asking = err == :ask
       future.url = url
       leftover << future
     end
 
-    [leftover, moved]
-  rescue Redis::CannotConnectError
+    [leftover, error]
+  rescue LoadingStateError, Redis::CannotConnectError => e
     # reset url and asking when connection refused
     futures.each{ |f| f.url = nil; f.asking = false }
 
-    [futures, true]
+    [futures, e.is_a?(LoadingStateError) ? :loading : :down]
   end
 
   def scan_reply(reply)

data/lib/redis_cluster/client.rb

@@ -6,6 +6,8 @@ require_relative 'version'
 
 class RedisCluster
 
+  class LoadingStateError < StandardError; end
+
   # Client is a decorator object for Redis::Client. It add queue to support pipelining and another
   # useful addition
   class Client
@@ -17,7 +19,7 @@ class RedisCluster
       @queue = []
       @url = "#{client.host}:#{client.port}"
 
-      @loading = false
+      @healthy = true
       @ban_from = nil
     end
 
@@ -51,15 +53,15 @@ class RedisCluster
     end
 
     def healthy
-      return true unless @loading
+      return true if @healthy
 
-      # ban for 60 seconds for loading state
+      # ban for 60 seconds for unhealthy state
       if Time.now - @ban_from > 60
-        @loading = false
+        @healthy = true
         @ban_from = nil
       end
 
-      !@loading
+      @healthy
     end
 
     private
@@ -71,16 +73,20 @@ class RedisCluster
       client.process(queue) do
         queue.size.times do |i|
           result[i] = client.read
-        end
-      end
-      @queue = []
 
-      if result.last.is_a?(Redis::CommandError) && result.last.message['LOADING']
-        @loading = true
-        @ban_from = Time.now
+          unhealthy! if result[i].is_a?(Redis::CommandError) && result[i].message['LOADING']
+        end
       end
 
       result
+    ensure
+      @queue = []
+    end
+
+    def unhealthy!
+      @healthy = false
+      @ban_from = Time.now
+      raise LoadingStateError
     end
   end
 end

data/lib/redis_cluster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class RedisCluster
-  VERSION = '1.0.0-rc.3'
+  VERSION = '1.0.0-rc.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.3
+  version: 1.0.0.pre.rc.4
 platform: ruby
 authors:
 - Bukalapak