redis-cluster-client 0.17.5 → 0.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb60940c0dbbb1bbf6497debd026596a02223668a8c7fa39b48055f5461db379
-  data.tar.gz: ffbd5eaec4b8d29637d0a4d65053039e81a08477a28d1b9e201ddba355030eae
+  metadata.gz: 675e3b7c851ac7deebc2f261d0aaa7fa6ef4c1865b3382014c41404ca314f5cc
+  data.tar.gz: 6a25062f50524661e566a1223752822711cf10246bedec98e52d1bdac3205fcc
 SHA512:
-  metadata.gz: 4d107b60e99745a2303b0c2f7fc702baa955f4f52a7873bd6bf11ef885dbbebdb461dd8c85f6ff4387e4460a511daed69f33a813d1dac851981dd34bb25a6128
-  data.tar.gz: bd9515f510ffe274f2e30c0fefb47729425a7a1d7a11c52f3b1ba1c331b5fd747c6a5398e553952bcf4a935f05919811e02e838ba76462b65a259e35d580ea94
+  metadata.gz: 98cd5427026578e9a175cdcd21def056ca24997213f1c70385c193ce5fa2991a5f60edadb34e557d5c4a75ba4ff985d2c9a8b0c2f7e3e76f22cd9ce529846961
+  data.tar.gz: 1f8e2a9cc8576fee87fdfb91485fbb13a5609381ef8f186ae287915f8f51cd4c3611e627e65d82d9c0767d9345a1d62e14a24b0b0a41dd70624558fe3b50e2c5

data/lib/redis_client/cluster/node/base_topology.rb

@@ -42,6 +42,14 @@ class RedisClient
           @replica_clients.freeze
         end
 
+        def connect_to_node(node_key, option)
+          return @clients[node_key] if @clients.key?(node_key)
+
+          client = build_client(node_key, option)
+          @clients = @clients.merge(node_key => client)
+          client
+        end
+
         private
 
         def disconnect_from_unwanted_nodes(options)
@@ -52,13 +60,15 @@ class RedisClient
 
         def connect_to_new_nodes(options)
           (options.keys - @clients.keys).each do |node_key|
-            option = options[node_key].merge(@client_options)
-            config = ::RedisClient::Cluster::Node::Config.new(scale_read: @replica_node_keys.include?(node_key), **option)
-            client = @pool.nil? ? config.new_client : config.new_pool(**@pool)
-            @clients[node_key] = client
+            @clients[node_key] = build_client(node_key, options[node_key])
           end
         end
 
+        def build_client(node_key, option)
+          config = ::RedisClient::Cluster::Node::Config.new(scale_read: @replica_node_keys.include?(node_key), **option.merge(@client_options))
+          @pool.nil? ? config.new_client : config.new_pool(**@pool)
+        end
+
         def make_random(seed)
           # OPTIMIZE: Figure out the most elegant way to pin a node during a pipeline or scan.
           seed.nil? ? Random : Random.new(seed)

data/lib/redis_client/cluster/node.rb

@@ -129,6 +129,22 @@ class RedisClient
         @topology.clients.fetch(node_key)
       end
 
+      def find_or_connect(node_key)
+        client = @topology.clients[node_key]
+        return client unless client.nil?
+        raise ReloadNeeded if node_key.nil? || !@mutex.try_lock
+
+        begin
+          @topology.connect_to_node(node_key, @config.client_config_for_node(node_key))
+        ensure
+          @mutex.unlock
+        end
+      end
+
+      def primary_node_key?(node_key)
+        @replications.key?(node_key)
+      end
+
       def call_all(method, command, args, &block)
         call_multiple_nodes!(@topology.clients, method, command, args, &block)
       end

data/lib/redis_client/cluster/router.rb

@@ -238,14 +238,16 @@ class RedisClient
 
       def assign_redirection_node(err_msg)
         _, slot, node_key = err_msg.split
-        slot = slot.to_i
-        @node.update_slot(slot, node_key)
-        handle_node_reload_error { @node.find_by(node_key) }
+        # A MOVED to anything but a known primary means the map is behind; the reload is throttled by the jitter.
+        renew_cluster_state unless @node.primary_node_key?(node_key)
+        node = handle_node_reload_error { @node.find_or_connect(node_key) }
+        @node.update_slot(slot.to_i, node_key)
+        node
       end
 
       def assign_asking_node(err_msg)
         _, _, node_key = err_msg.split
-        handle_node_reload_error { @node.find_by(node_key) }
+        handle_node_reload_error { @node.find_or_connect(node_key) }
       end
 
       def node_keys

metadata

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