redis-cluster-client 0.17.3 → 0.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9d2adeb89553bf3e1bfdb3d98f1dabed5a9e4347bee756776081036a1d4341
-  data.tar.gz: 9576cdbb916ee5b1ea82b722bb41a8144f46bbd4641620c41822c89be85bcf34
+  metadata.gz: fb60940c0dbbb1bbf6497debd026596a02223668a8c7fa39b48055f5461db379
+  data.tar.gz: ffbd5eaec4b8d29637d0a4d65053039e81a08477a28d1b9e201ddba355030eae
 SHA512:
-  metadata.gz: 99ba847297a711cb7f1af1c05da9cf4222d00c3c89a91e4ba92b8e7eb5078275db448b46ce573b97e9fa03e40fd7cb69deac0987a43fc6be3dc3b53ea9779024
-  data.tar.gz: 8755ce77dfad1fc86fdb17ce63a31aa5eb71fa8aba44a84eea3194c29d2df2045dfeab48d60137d9e1032ec1cfc42a66aef732c48ba005f38da4a687c084ec8a
+  metadata.gz: 4d107b60e99745a2303b0c2f7fc702baa955f4f52a7873bd6bf11ef885dbbebdb461dd8c85f6ff4387e4460a511daed69f33a813d1dac851981dd34bb25a6128
+  data.tar.gz: bd9515f510ffe274f2e30c0fefb47729425a7a1d7a11c52f3b1ba1c331b5fd747c6a5398e553952bcf4a935f05919811e02e838ba76462b65a259e35d580ea94

data/lib/redis_client/cluster/node.rb

@@ -155,7 +155,9 @@ class RedisClient
         result_values, errors = call_multiple_nodes(@topology.clients, method, command, args, &block)
         return result_values if errors.nil? || errors.empty?
 
-        raise ReloadNeeded if errors.values.any?(::RedisClient::ConnectionError)
+        raise ReloadNeeded if errors.values.any? do |err|
+          err.is_a?(::RedisClient::ConnectionError) && !err.is_a?(::RedisClient::CheckoutTimeoutError)
+        end
 
         raise ::RedisClient::Cluster::ErrorCollection.with_errors(errors)
       end

data/lib/redis_client/cluster/optimistic_locking.rb

@@ -34,6 +34,8 @@ class RedisClient
               @router.renew_cluster_state if e.message.start_with?('CLUSTERDOWN')
               raise
             end
+          rescue ::RedisClient::CheckoutTimeoutError
+            raise
           rescue ::RedisClient::ConnectionError
             @router.renew_cluster_state
             raise
@@ -52,6 +54,8 @@ class RedisClient
           times_block_executed += 1
           handle_asking_once(nd, &blk)
         end
+      rescue ::RedisClient::CheckoutTimeoutError
+        raise
       rescue ::RedisClient::ConnectionError
         # Deduct the number of retries that happened _inside_ router#handle_redirection from our remaining
         # _external_ retries. Always deduct at least one in case handle_redirection raises without trying the block.

data/lib/redis_client/cluster/pipeline.rb

@@ -205,7 +205,7 @@ class RedisClient
             cluster_state_errors ||= {}
             cluster_state_errors[node_key] = v
           when StandardError
-            cluster_state_errors ||= {} if v.is_a?(::RedisClient::ConnectionError)
+            cluster_state_errors ||= {} if v.is_a?(::RedisClient::ConnectionError) && !v.is_a?(::RedisClient::CheckoutTimeoutError)
             errors ||= {}
             errors[node_key] = v
           else
@@ -277,10 +277,16 @@ class RedisClient
           try_redirection(node, pipeline, inner_index)
         elsif err.message.start_with?('ASK')
           node = @router.assign_asking_node(err.message)
-          try_asking(node) ? try_redirection(node, pipeline, inner_index) : err
+          node.with do |client|
+            try_asking(client) ? try_redirection(client, pipeline, inner_index) : err
+          end
         else
           err
         end
+      rescue ::RedisClient::CheckoutTimeoutError
+        raise if @exception
+
+        err
       end
 
       def try_redirection(node, pipeline, inner_index)
@@ -305,6 +311,8 @@ class RedisClient
 
       def try_asking(node)
         node.call('asking') == 'OK'
+      rescue ::RedisClient::CheckoutTimeoutError
+        raise
       rescue StandardError
         false
       end

data/lib/redis_client/cluster/pub_sub.rb

@@ -171,6 +171,8 @@ class RedisClient
 
       def handle_connection_error(node_key, ignore: false)
         yield
+      rescue ::RedisClient::CheckoutTimeoutError
+        raise
       rescue ::RedisClient::ConnectionError
         @state_dict[node_key]&.close
         @state_dict.delete(node_key)
@@ -186,6 +188,8 @@ class RedisClient
           @state_dict.clear
           @commands.each { |command| _call(command) }
           break
+        rescue ::RedisClient::CheckoutTimeoutError
+          raise
         rescue ::RedisClient::ConnectionError, ::RedisClient::Cluster::NodeMightBeDown
           attempt += 1
           raise if attempt >= 10

data/lib/redis_client/cluster/router.rb

@@ -42,7 +42,7 @@ class RedisClient
         return send_command_by_spec(method, command, args, &block) if action.nil?
 
         send_command_by_action(action, method, command, args, &block)
-      rescue ::RedisClient::CircuitBreaker::OpenCircuitError
+      rescue ::RedisClient::CircuitBreaker::OpenCircuitError, ::RedisClient::CheckoutTimeoutError
         raise
       rescue ::RedisClient::Cluster::Node::ReloadNeeded
         renew_cluster_state
@@ -58,6 +58,7 @@ class RedisClient
         raise if e.errors.any?(::RedisClient::CircuitBreaker::OpenCircuitError)
 
         renew_cluster_state if e.errors.values.any? do |err|
+          next false if err.is_a?(::RedisClient::CheckoutTimeoutError)
           next false if ::RedisClient::Cluster::ErrorIdentification.identifiable?(err) && @node.none? { |c| ::RedisClient::Cluster::ErrorIdentification.client_owns_error?(err, c) }
 
           err.message.start_with?('CLUSTERDOWN') || err.is_a?(::RedisClient::ConnectionError)
@@ -84,46 +85,56 @@ class RedisClient
       end
 
       def handle_redirection(node, command, retry_count:) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-        yield node
-      rescue ::RedisClient::CircuitBreaker::OpenCircuitError
-        raise
-      rescue ::RedisClient::CommandError => e
-        raise unless ::RedisClient::Cluster::ErrorIdentification.client_owns_error?(e, node)
-
-        retry_count -= 1
-        if e.message.start_with?('MOVED')
-          node = assign_redirection_node(e.message)
-          retry if retry_count >= 0
-        elsif e.message.start_with?('ASK')
-          node = assign_asking_node(e.message)
-          if retry_count >= 0
-            node.call('asking')
-            retry
+        asking = false
+        begin
+          if asking
+            node.with do |client|
+              client.call('asking')
+              yield client
+            end
+          else
+            yield node
+          end
+        rescue ::RedisClient::CircuitBreaker::OpenCircuitError, ::RedisClient::CheckoutTimeoutError
+          raise
+        rescue ::RedisClient::CommandError => e
+          raise unless ::RedisClient::Cluster::ErrorIdentification.client_owns_error?(e, node)
+
+          retry_count -= 1
+          asking = false
+          if e.message.start_with?('MOVED')
+            node = assign_redirection_node(e.message)
+            retry if retry_count >= 0
+          elsif e.message.start_with?('ASK')
+            node = assign_asking_node(e.message)
+            asking = true
+            retry if retry_count >= 0
+          elsif e.message.start_with?('CLUSTERDOWN')
+            renew_cluster_state
+            retry if retry_count >= 0
           end
-        elsif e.message.start_with?('CLUSTERDOWN')
-          renew_cluster_state
-          retry if retry_count >= 0
-        end
 
-        raise
-      rescue ::RedisClient::ConnectionError => e
-        raise unless ::RedisClient::Cluster::ErrorIdentification.client_owns_error?(e, node)
+          raise
+        rescue ::RedisClient::ConnectionError => e
+          raise unless ::RedisClient::Cluster::ErrorIdentification.client_owns_error?(e, node)
 
-        renew_cluster_state
-        raise if command.nil? || command.empty?
+          renew_cluster_state
+          raise if command.nil? || command.empty?
 
-        retry_count -= 1
-        raise if retry_count < 0
+          retry_count -= 1
+          raise if retry_count < 0
 
-        # Find the node to use for this command - if this fails for some reason, though, re-use
-        # the old node.
-        begin
-          node = find_node(find_node_key(command))
-        rescue StandardError
-          raise e
-        end
+          # Find the node to use for this command - if this fails for some reason, though, re-use
+          # the old node.
+          begin
+            node = find_node(find_node_key(command))
+          rescue StandardError
+            raise e
+          end
 
-        retry
+          asking = false
+          retry
+        end
       end
 
       def scan(command, seed: nil, cursor_index: 1) # rubocop:disable Metrics/AbcSize
@@ -146,6 +157,8 @@ class RedisClient
         client_index += 1 if result_cursor == 0
 
         [((result_cursor << 8) + client_index).to_s, result_keys]
+      rescue ::RedisClient::CheckoutTimeoutError
+        raise
       rescue ::RedisClient::ConnectionError
         renew_cluster_state
         raise
@@ -351,7 +364,8 @@ class RedisClient
         elsif command[1].casecmp('purge').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
         else
-          assign_node(command).public_send(method, *args, command, &block)
+          # The other subcommands keep the default routing with the redirection handling.
+          send_command_by_spec(method, command, args, &block)
         end
       end
 
@@ -360,12 +374,15 @@ class RedisClient
           @node.call_all(method, command, args, &block).flatten
         elsif command[1].casecmp('pause').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
+        elsif command[1].casecmp('unpause').zero?
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
         elsif command[1].casecmp('reply').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
         elsif command[1].casecmp('setname').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
         else
-          assign_node(command).public_send(method, *args, command, &block)
+          # The other subcommands keep the default routing with the command tips.
+          send_command_by_spec(method, command, args, &block)
         end
       end
 
@@ -376,8 +393,15 @@ class RedisClient
            command[1].casecmp('slots').zero? ||
            command[1].casecmp('shards').zero? ||
            command[1].casecmp('count-failure-reports').zero? ||
-           command[1].casecmp('slaves').zero?
+           command[1].casecmp('slaves').zero? ||
+           command[1].casecmp('replicas').zero? ||
+           command[1].casecmp('myid').zero? ||
+           command[1].casecmp('myshardid').zero? ||
+           command[1].casecmp('links').zero?
           assign_node(command).public_send(method, *args, command, &block)
+        elsif command[1].casecmp('slot-stats').zero?
+          # Each primary replies with the statistics of its own slots only.
+          @node.call_primaries(method, command, args).flatten(1).then(&TSF.call(block))
         elsif command[1].casecmp('saveconfig').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
         elsif command[1].casecmp('countkeysinslot').zero? || command[1].casecmp('getkeysinslot').zero?
@@ -394,15 +418,18 @@ class RedisClient
         if command[1].casecmp('debug').zero?
           @node.call_all(method, command, args).first.then(&TSF.call(block))
         elsif command[1].casecmp('kill').zero?
-          @node.call_all(method, command, args).first.then(&TSF.call(block))
+          # The primaries without any running script reply with the NOTBUSY error.
+          @node.call_primaries_leniently(method, command, args).first.then(&TSF.call(block))
         elsif command[1].casecmp('flush').zero?
-          @node.call_primaries(method, command, args).first.then(&TSF.call(block))
+          # The redis 7.0 or later doesn't propagate the scripts to the replicas.
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
         elsif command[1].casecmp('load').zero?
-          @node.call_primaries(method, command, args).first.then(&TSF.call(block))
+          @node.call_all(method, command, args).first.then(&TSF.call(block))
         elsif command[1].casecmp('exists').zero?
           @node.call_all(method, command, args).transpose.map { |arr| arr.any?(&:zero?) ? 0 : 1 }.then(&TSF.call(block))
         else
-          assign_node(command).public_send(method, *args, command, &block)
+          # The other subcommands keep the default routing with the redirection handling.
+          send_command_by_spec(method, command, args, &block)
         end
       end
 

data/lib/redis_client/cluster/transaction.rb

@@ -124,22 +124,27 @@ class RedisClient
         end
       end
 
-      def send_pipeline(client, redirect:) # rubocop:disable Metrics/AbcSize
+      def send_pipeline(client, redirect:) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
         replies = client.ensure_connected_cluster_scoped(retryable: @retryable) do |connection|
           commands = @pipeline._commands
           client.middlewares.call_pipelined(commands, client.config) do
             connection.call_pipelined(commands, nil)
           rescue ::RedisClient::CommandError => e
             ensure_the_same_slot!(commands)
-            return handle_command_error!(e, redirect: redirect) unless redirect.zero?
+            raise if redirect.zero?
+            # Follow the redirection after leaving this block, so that errors from the other node don't close or retry this connection.
+            break e if e.message.start_with?('MOVED', 'ASK')
 
-            raise
+            handle_command_error!(e, redirect: redirect)
           end
         end
 
+        return handle_command_error!(replies, redirect: redirect) if replies.is_a?(::RedisClient::CommandError)
         return if replies.last.nil?
 
         coerce_results!(replies.last)
+      rescue ::RedisClient::CheckoutTimeoutError
+        raise
       rescue ::RedisClient::ConnectionError
         @router.renew_cluster_state if @watching_slot.nil?
         raise
@@ -171,7 +176,9 @@ class RedisClient
           send_transaction(node, redirect: redirect - 1)
         elsif err.message.start_with?('ASK')
           node = @router.assign_asking_node(err.message)
-          try_asking(node) ? send_transaction(node, redirect: redirect - 1) : raise(err)
+          node.with do |client|
+            try_asking(client) ? send_transaction(client, redirect: redirect - 1) : raise(err)
+          end
         elsif err.message.start_with?('CLUSTERDOWN')
           @router.renew_cluster_state if @watching_slot.nil?
           raise err
@@ -190,6 +197,8 @@ class RedisClient
 
       def try_asking(node)
         node.call('asking') == 'OK'
+      rescue ::RedisClient::CheckoutTimeoutError
+        raise
       rescue StandardError
         false
       end

metadata

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