redis-cluster-client 0.11.2 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce265da4f3a871e187b651c27ce9ee1d9a9321e346c2b1c3d1eba6f40139192
-  data.tar.gz: 95252d4d8b20e77a3bcc91035208c3d9baafbf2ad31d60adaa4376b38c75c2fa
+  metadata.gz: f72e0ed5a40d8d663d00a29ffb43ec046d911c73e514fa709f907eaf59d2e751
+  data.tar.gz: 442e3c7ef0e59dbef1950eb661aaf4441226927d4c871ae9a81824b33c456c4e
 SHA512:
-  metadata.gz: b2b7b9f733569fe7ba66dc4d49241ac827e6c3e23ea74fa9a04efbb985b601ca575302b8316e891160896d880cc74a2bdb3b88533478cbdab8e1e90b6d2d8926
-  data.tar.gz: a7982da3ad7a8a373f1ce9993262a279e50889be71bdc5913806da006a9252b65d3574bf816bc2ddb98f0034b6195890c23486eb2155d2ca8a6785753c3f69f1
+  metadata.gz: 3c06f2218983448bba3daef5209828aec9b236757094a9635e514519adf0757385f91c8c7d9a62a86d6eb9bf652e9b354a71c457a60208793c63ebd43c14c3d0
+  data.tar.gz: 523b7c8b897329260cacf1ab03ba26f917aa8dea0a78682d3aeeb8da538bed87ee482ed4f8e8db6e8f1d63649447b664cd86360f0a7e8bb554f4457d451c0946

data/lib/redis_client/cluster/errors.rb

@@ -37,8 +37,8 @@ class RedisClient
         end
 
         @errors = errors
-        messages = @errors.map { |node_key, error| "#{node_key}: #{error.message}" }
-        super("Errors occurred on any node: #{messages.join(', ')}")
+        messages = @errors.map { |node_key, error| "#{node_key}: (#{error.class}) #{error.message}" }
+        super(messages.join(', '))
       end
     end
 

data/lib/redis_client/cluster/optimistic_locking.rb

@@ -33,7 +33,7 @@ class RedisClient
                 raise
               end
             rescue ::RedisClient::CommandError => e
-              @router.renew_cluster_state if e.message.start_with?('CLUSTERDOWN Hash slot not served')
+              @router.renew_cluster_state if e.message.start_with?('CLUSTERDOWN')
               raise
             end
           rescue ::RedisClient::ConnectionError

data/lib/redis_client/cluster/pipeline.rb

@@ -73,7 +73,7 @@ class RedisClient
                 first_exception ||= result
               end
 
-              stale_cluster_state = true if result.message.start_with?('CLUSTERDOWN Hash slot not served')
+              stale_cluster_state = true if result.message.start_with?('CLUSTERDOWN')
             end
 
             results[index] = result

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,13 +90,10 @@ class RedisClient
 
           case event = @queue.pop(true)
           when ::RedisClient::CommandError
-            raise event unless event.message.start_with?('MOVED', 'CLUSTERDOWN Hash slot not served')
+            raise event unless event.message.start_with?('MOVED', 'CLUSTERDOWN')
 
-            @router.renew_cluster_state
-            break start_over
-          when ::RedisClient::ConnectionError
-            @router.renew_cluster_state
             break start_over
+          when ::RedisClient::ConnectionError then break start_over
           when StandardError then raise event
           when Array then break event
           end
@@ -151,25 +149,23 @@ class RedisClient
       def handle_connection_error(node_key, ignore: false)
         yield
       rescue ::RedisClient::ConnectionError
-        @state_dict[node_key].close
+        @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 do |command|
-          loop do
-            _call(command)
-            break
-          rescue ::RedisClient::ConnectionError
-            sleep 1.0
-          end
+        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
-
-        nil
       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
@@ -74,7 +74,7 @@ class RedisClient
         renew_cluster_state
         raise
       rescue ::RedisClient::CommandError => e
-        renew_cluster_state if e.message.start_with?('CLUSTERDOWN Hash slot not served')
+        renew_cluster_state if e.message.start_with?('CLUSTERDOWN')
         raise
       rescue ::RedisClient::Cluster::ErrorCollection => e
         raise if e.errors.any?(::RedisClient::CircuitBreaker::OpenCircuitError)
@@ -82,7 +82,7 @@ class RedisClient
         renew_cluster_state if e.errors.values.any? do |err|
           next false if ::RedisClient::Cluster::ErrorIdentification.identifiable?(err) && @node.none? { |c| ::RedisClient::Cluster::ErrorIdentification.client_owns_error?(err, c) }
 
-          err.message.start_with?('CLUSTERDOWN Hash slot not served') || err.is_a?(::RedisClient::ConnectionError)
+          err.message.start_with?('CLUSTERDOWN') || err.is_a?(::RedisClient::ConnectionError)
         end
 
         raise
@@ -123,7 +123,7 @@ class RedisClient
             node.call('ASKING')
             retry
           end
-        elsif e.message.start_with?('CLUSTERDOWN Hash slot not served')
+        elsif e.message.start_with?('CLUSTERDOWN')
           renew_cluster_state
           retry if retry_count >= 0
         end
@@ -241,6 +241,8 @@ class RedisClient
 
       def renew_cluster_state
         @node.reload!
+      rescue ::RedisClient::Cluster::InitialSetupError
+        # ignore
       end
 
       def close

data/lib/redis_client/cluster/transaction.rb

@@ -170,7 +170,7 @@ class RedisClient
         elsif err.message.start_with?('ASK')
           node = @router.assign_asking_node(err.message)
           try_asking(node) ? send_transaction(node, redirect: redirect - 1) : err
-        elsif err.message.start_with?('CLUSTERDOWN Hash slot not served')
+        elsif err.message.start_with?('CLUSTERDOWN')
           @router.renew_cluster_state if @watching_slot.nil?
           raise err
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.4
 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