redis-cluster 1.0.0 → 1.0.1.pre.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 328dcd9bbc349a36b70a5f91bc16c69345bef62c
-  data.tar.gz: 32720a7f55ac9b912878eaf3a287bb940000f461
+SHA256:
+  metadata.gz: 9f8427709e6b67eaf1266d6e330dfc37958fbb10dc0ab3845ee97a14319466ce
+  data.tar.gz: f26b971ccc78221ef3a3a1c6da1207e71d8b594d3c955ee529743abea5fb4c08
 SHA512:
-  metadata.gz: 7e35a19038dfac92f8c0968f44bf442a9eb225b324d2a066aed1aa83e110ea840582113cbda262e0c6323ccaac955eb6f8921b85585d8c91f602adba1913d863
-  data.tar.gz: 182e883b1fc704db0f1d8e2737fe9a1cc87209d37bf53dc2976f917d427d0ccf4cf400fcb7e7338119ec9e351aa8ed6aa7e62a909a5a209a4aa330a971e6bf98
+  metadata.gz: bc342af53829102b0da2108ca999ca74473d62e54adeb3238e898f1e899a4510d5785b07c838b22a282dce5c65e59a8187f34cc3fc6595957dc36289d4595778
+  data.tar.gz: 95221ec6964ab2aac0c639a4da59a0f501489e97ad5e27eb27be5f61a5c5158d96ae7c425eb9145b9360df06bd198b8510d96e8cbd2ed1226109ee98300bd6c9

data/lib/redis-cluster.rb

@@ -134,7 +134,7 @@ class RedisCluster
         cluster.reset if err == :moved
         asking = err == :ask
         client = cluster[url]
-      rescue LoadingStateError, Redis::CannotConnectError => e
+      rescue NodeUnhealthyError, Redis::CannotConnectError => e
         if e.is_a?(Redis::CannotConnectError)
           asking = false
           cluster.reset
@@ -198,11 +198,11 @@ class RedisCluster
     end
 
     [leftover, error]
-  rescue LoadingStateError, Redis::CannotConnectError => e
+  rescue NodeUnhealthyError, Redis::CannotConnectError => e
     # reset url and asking when connection refused
     futures.each{ |f| f.url = nil; f.asking = false }
 
-    [futures, e.is_a?(LoadingStateError) ? :loading : :down]
+    [futures, e.is_a?(NodeUnhealthyError) ? :loading : :down]
   end
 
   def scan_reply(reply)

data/lib/redis_cluster/client.rb

@@ -6,7 +6,7 @@ require_relative 'version'
 
 class RedisCluster
 
-  class LoadingStateError < StandardError; end
+  class NodeUnhealthyError < StandardError; end
 
   # Client is a decorator object for Redis::Client. It add queue to support pipelining and another
   # useful addition
@@ -52,7 +52,7 @@ class RedisCluster
       end
     end
 
-    def healthy
+    def healthy?
       return true if @healthy
 
       # ban for 60 seconds for unhealthy state
@@ -74,7 +74,7 @@ class RedisCluster
         queue.size.times do |i|
           result[i] = client.read
 
-          unhealthy! if result[i].is_a?(Redis::CommandError) && result[i].message['LOADING']
+          unhealthy!(result[i]) if error?(result[i])
         end
       end
 
@@ -83,10 +83,17 @@ class RedisCluster
       @queue = []
     end
 
-    def unhealthy!
+    def unhealthy!(cause)
       @healthy = false
       @ban_from = Time.now
-      raise LoadingStateError
+
+      error = NodeUnhealthyError.new("Node #{@url} is unhealthy: #{cause}")
+      error.set_backtrace(cause.backtrace)
+      raise error
+    end
+
+    def error?(res)
+      res.is_a?(Redis::CommandError) && (res.message['LOADING'] || res.message['CLUSTERDOWN'])
     end
   end
 end

data/lib/redis_cluster/cluster.rb

@@ -16,7 +16,10 @@ class RedisCluster
       @slots = []
       @clients = {}
       @replicas = nil
-      @client_creater = block
+      @client_creater = block || proc do |url|
+        host, port = url.split(':', 2)
+        Client.new(host: host, port: port)
+      end
 
       @buffer = []
       init_client(seeds)
@@ -30,6 +33,10 @@ class RedisCluster
       options[:read_mode] || :master
     end
 
+    def logger
+      options[:logger]
+    end
+
     def slot_for(keys)
       slot = [keys].flatten.map{ |k| _slot_for(k) }.uniq
       slot.size == 1 ? slot.first : (raise CROSSSLOT_ERROR)
@@ -67,7 +74,6 @@ class RedisCluster
         client = random
         slots_and_clients(client)
       rescue StandardError => e
-        clients.delete(client.url)
         try.positive? ? retry : (raise e)
       end
     end
@@ -83,20 +89,18 @@ class RedisCluster
     private
 
     def pick_client(pool, skip: 0)
-      unhealthy_count = 0
+      buff_len = 0
 
       (skip...pool.length).each do |i|
-        if pool[i].healthy
-          @buffer[i - skip] = pool[i]
-        else
-          unhealthy_count += 1
-        end
+        next unless pool[i].healthy?
+
+        @buffer[buff_len] = pool[i]
+        buff_len += 1
       end
 
-      buffer_length = pool.length - skip - unhealthy_count
-      return nil if buffer_length.zero?
+      return nil if buff_len.zero?
 
-      i = rand(buffer_length)
+      i = rand(buff_len)
       @buffer[i]
     end
 
@@ -118,7 +122,11 @@ class RedisCluster
         arr[2..-1].each_with_index do |a, i|
           cli = self["#{a[0]}:#{a[1]}"]
           replicas[arr[0]] << cli
-          cli.call([:readonly]) if i.nonzero?
+          begin
+            cli.call([:readonly]) if i.nonzero?
+          rescue NodeUnhealthyError => e
+            logger&.error(e)
+          end
         end
 
         (arr[0]..arr[1]).each do |slot|
@@ -149,12 +157,7 @@ class RedisCluster
     end
 
     def create_client(url)
-      if client_creater
-        client_creater.call(url)
-      else
-        host, port = url.split(':', 2)
-        Client.new(host: host, port: port)
-      end
+      client_creater.call(url)
     end
 
     # -----------------------------------------------------------------------------

data/lib/redis_cluster/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.pre.rc.1
 platform: ruby
 authors:
 - Bukalapak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -61,12 +61,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Redis cluster client. Support pipelining.