redis-cluster-client 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0561fdd5885f8c6c5c5c100af032b867224eff3ed91b546b6885f8bf3bd76663
-  data.tar.gz: 1ebe59416fb043af9da7a926cd338ac260ce1a46e5220b46f7a6744c8f1b8c2b
+  metadata.gz: aff938c0517542c32f98206c28f1f605a52751e2e2e9a1bd10f5576285f568ee
+  data.tar.gz: 8a3d45fba93334959b1ee67504d2703bb116a8133ef8dac2aa8f314fdb74b268
 SHA512:
-  metadata.gz: 86661400532550e005beb98e740e4939ffcf93c1b66fb47930bc2a5819f5dbba60e940c8e0183d312a6ce7cb55d1cc0634081029eb8e5c1b8f68ea2862d9e0df
-  data.tar.gz: 3629f63ed379946bc8951c57ada535573130e8db504a2f5b7644ef9091408ac3223c5b0a260b13d6b84ab889b3e47c4571bbc10f5b21ceaf6758dc60c28a00b3
+  metadata.gz: 63dec0155a50a0dbb7a17763c43291d371abe4e3df407340ba8edf125cf2c2bb338f607026a1d004dca489761cb2e6b5450e68a468f18799e5c3443b52a21be7
+  data.tar.gz: 4de6c4688ca120d7f4b636bd884195b3cddc3bf8d217ea662a1f382ced46de2c9e24b0e967a801d175f0572a083b9e5ea835d54797422cf60ce799cda3002f74

data/lib/redis_client/cluster/errors.rb

@@ -29,7 +29,7 @@ class RedisClient
     end
 
     # Raised when error occurs on any node of cluster.
-    class CommandErrorCollection < ::RedisClient::Error
+    class ErrorCollection < ::RedisClient::Error
       attr_reader :errors
 
       def initialize(errors)

data/lib/redis_client/cluster/node.rb

@@ -118,7 +118,7 @@ class RedisClient
         try_map { |_, client| client.send(method, *command, **kwargs, &block) }.values
       end
 
-      def call_primary(method, *command, **kwargs, &block)
+      def call_primaries(method, *command, **kwargs, &block)
         try_map do |node_key, client|
           next if replica?(node_key)
 
@@ -126,22 +126,20 @@ class RedisClient
         end.values
       end
 
-      def call_replica(method, *command, **kwargs, &block)
-        return call_primary(method, *command, **kwargs, &block) if replica_disabled?
+      def call_replicas(method, *command, **kwargs, &block)
+        return call_primaries(method, *command, **kwargs, &block) if replica_disabled?
 
+        replica_node_keys = @replications.values.map(&:sample)
         try_map do |node_key, client|
-          next if primary?(node_key)
+          next if primary?(node_key) || !replica_node_keys.include?(node_key)
 
           client.send(method, *command, **kwargs, &block)
         end.values
       end
 
       def scale_reading_clients
-        clients = @clients.select do |node_key, _|
-          replica_disabled? ? primary?(node_key) : replica?(node_key)
-        end
-
-        clients.values.sort_by do |client|
+        keys = replica_disabled? ? @replications.keys : @replications.values.map(&:first)
+        @clients.select { |k, _| keys.include?(k) }.values.sort_by do |client|
           ::RedisClient::Cluster::NodeKey.build_from_host_port(client.config.host, client.config.port)
         end
       end
@@ -173,6 +171,12 @@ class RedisClient
         @mutex.synchronize { @slots[slot] = node_key }
       end
 
+      def replicated?(primary_node_key, replica_node_key)
+        return false if @replications.nil? || @replications.size.zero?
+
+        @replications.fetch(primary_node_key).include?(replica_node_key)
+      end
+
       private
 
       def replica_disabled?
@@ -184,7 +188,9 @@ class RedisClient
       end
 
       def replica?(node_key)
-        !(@replications.nil? || @replications.size.zero?) && @replications[node_key].size.zero?
+        return false if @replications.nil? || @replications.size.zero?
+
+        !@replications.key?(node_key)
       end
 
       def build_slot_node_mappings(node_info)
@@ -198,12 +204,12 @@ class RedisClient
         slots
       end
 
-      def build_replication_mappings(node_info)
+      def build_replication_mappings(node_info) # rubocop:disable Metrics/AbcSize
         dict = node_info.to_h { |info| [info[:id], info] }
         node_info.each_with_object(Hash.new { |h, k| h[k] = [] }) do |info, acc|
           primary_info = dict[info[:primary_id]]
           acc[primary_info[:node_key]] << info[:node_key] unless primary_info.nil?
-          acc[info[:node_key]]
+          acc[info[:node_key]] if info[:role] == 'master' # for the primary which have no replicas
         end
       end
 
@@ -222,14 +228,14 @@ class RedisClient
       end
 
       def try_map # rubocop:disable Metrics/MethodLength
-        errors = {}
         results = {}
+        errors = {}
         threads = @clients.map do |k, v|
           Thread.new(k, v) do |node_key, client|
             Thread.pass
             reply = yield(node_key, client)
             results[node_key] = reply unless reply.nil?
-          rescue ::RedisClient::CommandError => e
+          rescue StandardError => e
             errors[node_key] = e
           end
         end
@@ -237,7 +243,7 @@ class RedisClient
         threads.each(&:join)
         return results if errors.empty?
 
-        raise ::RedisClient::Cluster::CommandErrorCollection, errors
+        raise ::RedisClient::Cluster::ErrorCollection, errors
       end
     end
   end

data/lib/redis_client/cluster.rb

@@ -40,13 +40,13 @@ class RedisClient
         @size.zero?
       end
 
+      # TODO: https://github.com/redis-rb/redis-cluster-client/issues/37 handle redirections
       def execute # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-        all_replies = []
+        all_replies = Array.new(@size)
+        errors = {}
         threads = @grouped.map do |k, v|
           Thread.new(@client, k, v) do |client, node_key, rows|
             Thread.pass
-
-            node_key = node_key.nil? ? client.instance_variable_get(:@node).primary_node_keys.sample : node_key
             replies = client.send(:find_node, node_key).pipelined do |pipeline|
               rows.each do |row|
                 case row[1]
@@ -61,11 +61,15 @@ class RedisClient
             raise ReplySizeError, "commands: #{rows.size}, replies: #{replies.size}" if rows.size != replies.size
 
             rows.each_with_index { |row, idx| all_replies[row.first] = replies[idx] }
+          rescue StandardError => e
+            errors[node_key] = e
           end
         end
 
         threads.each(&:join)
-        all_replies
+        return all_replies if errors.empty?
+
+        raise ::RedisClient::Cluster::ErrorCollection, errors
       end
     end
 
@@ -183,13 +187,13 @@ class RedisClient
     def send_command(method, *command, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
       cmd = command.first.to_s.downcase
       case cmd
-      when 'acl', 'auth', 'bgrewriteaof', 'bgsave', 'quit', 'save'
+      when 'acl', 'auth', 'bgrewriteaof', 'bgsave', 'quit', 'save', 'ping'
         @node.call_all(method, *command, **kwargs, &block).first
       when 'flushall', 'flushdb'
-        @node.call_primary(method, *command, **kwargs, &block).first
-      when 'wait'     then @node.call_primary(method, *command, **kwargs, &block).sum
-      when 'keys'     then @node.call_replica(method, *command, **kwargs, &block).flatten.sort
-      when 'dbsize'   then @node.call_replica(method, *command, **kwargs, &block).sum
+        @node.call_primaries(method, *command, **kwargs, &block).first
+      when 'wait'     then send_wait_command(method, *command, **kwargs, &block)
+      when 'keys'     then @node.call_replicas(method, *command, **kwargs, &block).flatten.sort
+      when 'dbsize'   then @node.call_replicas(method, *command, **kwargs, &block).sum
       when 'scan'     then _scan(*command, **kwargs)
       when 'lastsave' then @node.call_all(method, *command, **kwargs, &block).sort
       when 'role'     then @node.call_all(method, *command, **kwargs, &block)
@@ -207,6 +211,19 @@ class RedisClient
         node = assign_node(*command)
         try_send(node, method, *command, **kwargs, &block)
       end
+    rescue RedisClient::Cluster::ErrorCollection => e
+      update_cluster_info! if e.errors.values.map(&:class).any?(::RedisClient::ConnectionError)
+      raise
+    end
+
+    def send_wait_command(method, *command, retry_count: 3, **kwargs, &block)
+      @node.call_primaries(method, *command, **kwargs, &block).sum
+    rescue RedisClient::Cluster::ErrorCollection => e
+      raise if retry_count <= 0 || e.errors.values.map(&:message).grep(/ERR WAIT cannot be used with replica instances/).empty?
+
+      update_cluster_info!
+      retry_count -= 1
+      retry
     end
 
     def send_config_command(method, *command, **kwargs, &block)
@@ -234,13 +251,17 @@ class RedisClient
       end
     end
 
-    def send_cluster_command(method, *command, **kwargs, &block)
+    def send_cluster_command(method, *command, **kwargs, &block) # rubocop:disable Metrics/MethodLength
       subcommand = command[1].to_s.downcase
       case subcommand
       when 'addslots', 'delslots', 'failover', 'forget', 'meet', 'replicate',
            'reset', 'set-config-epoch', 'setslot'
         raise ::RedisClient::Cluster::OrchestrationCommandNotSupported, ['cluster', subcommand]
       when 'saveconfig' then @node.call_all(method, *command, **kwargs, &block).first
+      when 'getkeysinslot'
+        raise ArgumentError, command.join(' ') if command.size != 4
+
+        find_node(@node.find_node_key_of_replica(command[2])).send(method, *command, **kwargs, &block)
       else assign_node(*command).send(method, *command, **kwargs, &block)
       end
     end
@@ -250,7 +271,7 @@ class RedisClient
       when 'debug', 'kill'
         @node.call_all(method, *command, **kwargs, &block).first
       when 'flush', 'load'
-        @node.call_primary(method, *command, **kwargs, &block).first
+        @node.call_primaries(method, *command, **kwargs, &block).first
       else assign_node(*command).send(method, *command, **kwargs, &block)
       end
     end
@@ -268,18 +289,16 @@ class RedisClient
 
     # @see https://redis.io/topics/cluster-spec#redirection-and-resharding
     #   Redirection and resharding
-    def try_send(node, method, *args, retry_count: 3, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def try_send(node, method, *args, retry_count: 3, **kwargs, &block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       node.send(method, *args, **kwargs, &block)
     rescue ::RedisClient::CommandError => e
-      if e.message.start_with?(REPLY_MOVED)
-        raise if retry_count <= 0
+      raise if retry_count <= 0
 
+      if e.message.start_with?(REPLY_MOVED)
         node = assign_redirection_node(e.message)
         retry_count -= 1
         retry
       elsif e.message.start_with?(REPLY_ASK)
-        raise if retry_count <= 0
-
         node = assign_asking_node(e.message)
         node.call(CMD_ASKING)
         retry_count -= 1
@@ -288,8 +307,11 @@ class RedisClient
         raise
       end
     rescue ::RedisClient::ConnectionError
+      raise if retry_count <= 0
+
       update_cluster_info!
-      raise
+      retry_count -= 1
+      retry
     end
 
     def _scan(*command, **kwargs) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
@@ -349,13 +371,16 @@ class RedisClient
       end
     end
 
-    def find_node(node_key)
+    def find_node(node_key, retry_count: 3)
       return @node.sample if node_key.nil?
 
       @node.find_by(node_key)
     rescue ::RedisClient::Cluster::Node::ReloadNeeded
+      raise(::RedisClient::ConnectionError, 'unstable cluster state') if retry_count <= 0
+
       update_cluster_info!(node_key)
-      @node.find_by(node_key)
+      retry_count -= 1
+      retry
     end
 
     def update_cluster_info!(node_key = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client