redis-cluster-client 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd66efdf343224572aeffdbfdd4cb96c8189bd45183c0a3934e6dd1964a35655
-  data.tar.gz: 66805c538066aabab413b767f0b9e8756c1eff8920f410a665939f18d69c0621
+  metadata.gz: 9ce265da4f3a871e187b651c27ce9ee1d9a9321e346c2b1c3d1eba6f40139192
+  data.tar.gz: 95252d4d8b20e77a3bcc91035208c3d9baafbf2ad31d60adaa4376b38c75c2fa
 SHA512:
-  metadata.gz: d325c2955718451c15084b58b0231d521065ebe1b8b549f79106f26132b50eb77ac90e6b0dcfb11868eb80b2d37a742f741b21d963c6ff92faacf4d88bc64830
-  data.tar.gz: 7e6c92442c2852b0533c19b4e60ff8e8e6532d55cbeebc9424e1b62081c6eb21af6a5717ae04fbb683083c271d3008934d0e17becc4b7abf232c005304c2b713
+  metadata.gz: b2b7b9f733569fe7ba66dc4d49241ac827e6c3e23ea74fa9a04efbb985b601ca575302b8316e891160896d880cc74a2bdb3b88533478cbdab8e1e90b6d2d8926
+  data.tar.gz: a7982da3ad7a8a373f1ce9993262a279e50889be71bdc5913806da006a9252b65d3574bf816bc2ddb98f0034b6195890c23486eb2155d2ca8a6785753c3f69f1

data/lib/redis_client/cluster/pub_sub.rb

@@ -89,12 +89,13 @@ class RedisClient
 
           case event = @queue.pop(true)
           when ::RedisClient::CommandError
-            if event.message.start_with?('MOVED', 'CLUSTERDOWN Hash slot not served')
-              @router.renew_cluster_state
-              break start_over
-            end
+            raise event unless event.message.start_with?('MOVED', 'CLUSTERDOWN Hash slot not served')
 
-            raise event
+            @router.renew_cluster_state
+            break start_over
+          when ::RedisClient::ConnectionError
+            @router.renew_cluster_state
+            break start_over
           when StandardError then raise event
           when Array then break event
           end
@@ -114,25 +115,20 @@ class RedisClient
         end
       end
 
-      def call_to_single_state(command, retry_count: 1)
+      def call_to_single_state(command)
         node_key = @router.find_node_key(command)
-        @state_dict[node_key] ||= State.new(@router.find_node(node_key).pubsub, @queue)
-        @state_dict[node_key].call(command)
-      rescue ::RedisClient::ConnectionError
-        @state_dict[node_key].close
-        @state_dict.delete(node_key)
-        @router.renew_cluster_state
-        retry_count -= 1
-        retry_count >= 0 ? retry : raise
+
+        handle_connection_error(node_key) do
+          @state_dict[node_key] ||= State.new(@router.find_node(node_key).pubsub, @queue)
+          @state_dict[node_key].call(command)
+        end
       end
 
       def call_to_all_states(command)
         @state_dict.each do |node_key, state|
-          state.call(command)
-        rescue ::RedisClient::ConnectionError
-          @state_dict[node_key].close
-          @state_dict.delete(node_key)
-          @router.renew_cluster_state
+          handle_connection_error(node_key, ignore: true) do
+            state.call(command)
+          end
         end
       end
 
@@ -152,10 +148,27 @@ class RedisClient
         timeout.nil? || timeout < 0 ? 0 : timeout * 1_000_000
       end
 
+      def handle_connection_error(node_key, ignore: false)
+        yield
+      rescue ::RedisClient::ConnectionError
+        @state_dict[node_key].close
+        @state_dict.delete(node_key)
+        @router.renew_cluster_state
+        raise unless ignore
+      end
+
       def start_over
         @state_dict.each_value(&:close)
         @state_dict.clear
-        @commands.each { |command| _call(command) }
+        @commands.each do |command|
+          loop do
+            _call(command)
+            break
+          rescue ::RedisClient::ConnectionError
+            sleep 1.0
+          end
+        end
+
         nil
       end
     end

data/lib/redis_client/cluster/router.rb

@@ -175,7 +175,12 @@ class RedisClient
       def find_node_key_by_key(key, seed: nil, primary: false)
         if key && !key.empty?
           slot = ::RedisClient::Cluster::KeySlotConverter.convert(key)
-          primary ? @node.find_node_key_of_primary(slot) : @node.find_node_key_of_replica(slot)
+          node_key = primary ? @node.find_node_key_of_primary(slot) : @node.find_node_key_of_replica(slot)
+          if node_key.nil?
+            renew_cluster_state
+            raise ::RedisClient::Cluster::NodeMightBeDown
+          end
+          node_key
         else
           primary ? @node.any_primary_node_key(seed: seed) : @node.any_replica_node_key(seed: seed)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Taishi Kasuga