redis-cluster-client 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd66efdf343224572aeffdbfdd4cb96c8189bd45183c0a3934e6dd1964a35655
-  data.tar.gz: 66805c538066aabab413b767f0b9e8756c1eff8920f410a665939f18d69c0621
+  metadata.gz: a18bda4b076ac6a39e7558b39b0ff5f443e2f9d192ff45ee6749e64b3a349fbd
+  data.tar.gz: ed166898e6dbb23b316d87162767fe06eb34440029bdb6f33764c58038c20d88
 SHA512:
-  metadata.gz: d325c2955718451c15084b58b0231d521065ebe1b8b549f79106f26132b50eb77ac90e6b0dcfb11868eb80b2d37a742f741b21d963c6ff92faacf4d88bc64830
-  data.tar.gz: 7e6c92442c2852b0533c19b4e60ff8e8e6532d55cbeebc9424e1b62081c6eb21af6a5717ae04fbb683083c271d3008934d0e17becc4b7abf232c005304c2b713
+  metadata.gz: 7b1ca4265e58d3d4cdb00c0ad9629d72dec6c1a0681d34663e38adb147a0d66985be3f4257d6f6d0c62752cda0f710bfd9e7eb9f3694e07ec4796ce99677c148
+  data.tar.gz: 178592be6e79bfdf2c5288f558fca21116aabd98cc10b4436298393d22f895844523b3e32f28635172229a404c55d83e52e242230677ab00d509dba7d70adc0c

data/lib/redis_client/cluster/pub_sub.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'redis_client'
+require 'redis_client/cluster/errors'
 require 'redis_client/cluster/normalized_cmd_name'
 
 class RedisClient
@@ -89,12 +90,11 @@ 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
+            break start_over
+          when ::RedisClient::ConnectionError
+            break start_over
           when StandardError then raise event
           when Array then break event
           end
@@ -114,25 +114,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,11 +147,26 @@ 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) }
-        nil
+        loop do
+          @router.renew_cluster_state
+          @state_dict.each_value(&:close)
+          @state_dict.clear
+          @queue.clear
+          @commands.each { |command| _call(command) }
+          break
+        rescue ::RedisClient::ConnectionError, ::RedisClient::Cluster::NodeMightBeDown
+          sleep 1.0
+        end
       end
     end
   end

data/lib/redis_client/cluster/router.rb

@@ -29,7 +29,7 @@ class RedisClient
         @pool = pool
         @client_kwargs = kwargs
         @node = ::RedisClient::Cluster::Node.new(concurrent_worker, config: config, pool: pool, **kwargs)
-        renew_cluster_state
+        @node.reload!
         @command = ::RedisClient::Cluster::Command.load(@node.replica_clients.shuffle, slow_command_timeout: config.slow_command_timeout)
         @command_builder = @config.command_builder
       end
@@ -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
@@ -236,6 +241,8 @@ class RedisClient
 
       def renew_cluster_state
         @node.reload!
+      rescue ::RedisClient::Cluster::InitialSetupError
+        # ignore
       end
 
       def close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.3
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client