redis-cluster-client 0.17.5 → 0.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb60940c0dbbb1bbf6497debd026596a02223668a8c7fa39b48055f5461db379
-  data.tar.gz: ffbd5eaec4b8d29637d0a4d65053039e81a08477a28d1b9e201ddba355030eae
+  metadata.gz: '028bfbb6e37f09e90d0739017bfac62b40a98be4de93a0eb795f48f14b15c294'
+  data.tar.gz: 978ffaa979749f1eac72fbb926c90a37802d68d7d5d0a874a99af528ada955bf
 SHA512:
-  metadata.gz: 4d107b60e99745a2303b0c2f7fc702baa955f4f52a7873bd6bf11ef885dbbebdb461dd8c85f6ff4387e4460a511daed69f33a813d1dac851981dd34bb25a6128
-  data.tar.gz: bd9515f510ffe274f2e30c0fefb47729425a7a1d7a11c52f3b1ba1c331b5fd747c6a5398e553952bcf4a935f05919811e02e838ba76462b65a259e35d580ea94
+  metadata.gz: 761229dba60980f5380627f23ad8961a551954ea47cfe43797ab483b1fe9dfbf96cbaebe4d7fec9c3fcdf724ad781f95467f2eb5ed01d772d730cc5a9e7f256e
+  data.tar.gz: 1f128f1d70c0420522f482f6bcc7e884083958ce9bc905ec87bbaaeef0922c24b5ebe3489c99c352812a1b3075d3a812a213b41a10827b1427f99af93f258088

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

data/lib/redis_client/cluster_config.rb

@@ -169,7 +169,7 @@ class RedisClient
       when Hash
         parse_node_option(addr)
       else
-        raise InvalidClientConfigError, "`nodes` option includes invalid type values: #{addr}"
+        raise InvalidClientConfigError, "`nodes` option includes invalid type values: #{addr.class}"
       end
     end
 
@@ -178,7 +178,7 @@ class RedisClient
 
       uri = URI(addr)
       scheme = uri.scheme || DEFAULT_SCHEME
-      raise InvalidClientConfigError, "`nodes` option includes a invalid uri scheme: #{addr}" unless VALID_SCHEMES.include?(scheme)
+      raise InvalidClientConfigError, "`nodes` option includes a invalid uri scheme: #{redact_url(addr)}" unless VALID_SCHEMES.include?(scheme)
 
       username = uri.user ? URI.decode_www_form_component(uri.user) : nil
       password = uri.password ? URI.decode_www_form_component(uri.password) : nil
@@ -190,7 +190,11 @@ class RedisClient
       { ssl: scheme == SECURE_SCHEME, username: username, password: password, host: host, port: port, db: db }
         .reject { |_, v| v.nil? || v == '' || v == false }
     rescue URI::InvalidURIError => e
-      raise InvalidClientConfigError, "#{e.message}: #{addr}"
+      raise InvalidClientConfigError, redact_url(e.message)
+    end
+
+    def redact_url(str)
+      str.sub(%r{//(.*)@}, '//REDACTED@')
     end
 
     def parse_node_option(addr)

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.7
 platform: ruby
 authors:
 - Taishi Kasuga