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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ff565ce3c8c2268935d56508aa5b5896a3f8eb
-  data.tar.gz: 474dd846727e7c52d56fea04333e0d35223026b0
+  metadata.gz: c4fb30f11cb1d74b3572c8e0c9ea64ff534da5c4
+  data.tar.gz: 08f644a16dc2155ea730e16170b40d72f2019511
 SHA512:
-  metadata.gz: 37eb706afca0090ea9a43bcf769ac86a06d2c423b8f20ebd9aa68a7631076ed165ab83ddc3fec015a92a3499b65f825c90ac453c7d8d74fa1bbee38e2c975235
-  data.tar.gz: b794604db2cf25cffbfbc92fd8120f9a7801f923f54ed077549d96f77a368f49b04dd8da33a60bb9c497a61a365aafb4c913a011e0f00f4445f2c140ebb3bcef
+  metadata.gz: 105c1a258630a397d8f51a259a356751efcf6d67cb68484b73e4f0fa230d05d896c5970298840961bbe472232a2d2f986e71f28841d2fbaa21628ccdc07b9149
+  data.tar.gz: ae7fa4048759d265ba68c6c21ba18acba1918a407f4c7879a4b18494a0595293a64ea84967add9d19b7a1f57ad7d3999bd4b407ec33ae1b6a249d2d60289d70c

data/lib/redis_cluster/client.rb

@@ -16,6 +16,9 @@ class RedisCluster
       @client = Redis::Client.new(opts)
       @queue = []
       @url = "#{client.host}:#{client.port}"
+
+      @loading = false
+      @ban_from = nil
     end
 
     def inspect
@@ -47,6 +50,18 @@ class RedisCluster
       end
     end
 
+    def healthy
+      return true unless @loading
+
+      # ban for 60 seconds for loading state
+      if Time.now - @ban_from > 60
+        @loading = false
+        @ban_from = nil
+      end
+
+      !@loading
+    end
+
     private
 
     def _commit
@@ -60,6 +75,11 @@ class RedisCluster
       end
       @queue = []
 
+      if result.last.is_a?(Redis::CommandError) && result.last.message['LOADING']
+        @loading = true
+        @ban_from = Time.now
+      end
+
       result
     end
   end

data/lib/redis_cluster/cluster.rb

@@ -41,9 +41,9 @@ class RedisCluster
       when :master
         slots[slot].first
       when :slave
-        slots[slot][1..-1].sample || slots[slot].first
+        slots[slot][1..-1].select(&:healthy).sample || slots[slot].first
       when :master_slave
-        slots[slot].sample
+        slots[slot].select(&:healthy).sample
       end
     end
 

data/lib/redis_cluster/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.2
+  version: 1.0.0.pre.rc.3
 platform: ruby
 authors:
 - Bukalapak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis