redis-cluster-client 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c16432e083671229128632c116401dc9b1bd56f6b3b1e3c8f107956901d29f2
-  data.tar.gz: b464a6f87e8c952a5e4f5b22d0609a9be09b3c6c7817eb91ed779e0b142a4290
+  metadata.gz: 80b5e1d6525a06ecf8747239269b110528bf9efc99ff3424108033c85cdc011a
+  data.tar.gz: 35b5aba54bc61e3731509c7ba3959289ddcfb30e40193f365fc26f62f4c7e60d
 SHA512:
-  metadata.gz: 0b94204a193f0bfe56c75da819651c8c16c72bd9620c51996f2dcfc8b2c7faefc416c342ca7631772c96d4fec7a9e7c8aede9638c28fb540855603b829a1042d
-  data.tar.gz: 6d873858848aa00124a043efce6ee8fdd629516e8c5447802b079636de1dd4782b0584c84d791ed0bc7c589d66c273e985878cdea238054e60f1a5a5a2ce72c9
+  metadata.gz: ab546dc6dc75d1ec1733c5cd5f29a451881d71db8c21e587be92ab77c2f12f602100468626b742a1d87caa98aa27699906f9aefd7d9cff02512c3be1e355bdd4
+  data.tar.gz: 741326d16416834940e08c7084019080188d3e6b252c6dafdf3037bb9a40e2f9aafc0dc771fce7ac4edbb50af6d630067fb3646f4e7f1016ab72d7ceafb04940

data/lib/redis_client/cluster/command.rb

@@ -13,7 +13,7 @@ class RedisClient
       private_constant :EMPTY_HASH
 
       Spec = Struct.new(
-        'RedisCommand',
+        'RedisCommandSpec',
         :first_key_position,
         :key_step,
         :write?,

data/lib/redis_client/cluster/concurrent_worker/none.rb

@@ -43,8 +43,8 @@ class RedisClient
 
           private
 
-          def exec(*args, **kwargs, &block)
-            block&.call(*args, **kwargs)
+          def exec(*args, **kwargs)
+            yield(*args, **kwargs) if block_given?
           rescue StandardError => e
             e
           end

data/lib/redis_client/cluster/node.rb

@@ -412,13 +412,13 @@ class RedisClient
           primary_id = nodes.find { |n| n.fetch('role') == 'master' }.fetch('id')
 
           nodes.each do |node|
-            ip = node.fetch('ip')
-            next if node.fetch('health') != 'online' || ip.nil? || ip.empty? || ip == '?'
+            host = pick_shard_host(node)
+            next if node.fetch('health') != 'online' || host.nil? || host.empty? || host == '?'
 
             role = node.fetch('role')
             acc << ::RedisClient::Cluster::Node::Info.new(
               id: node.fetch('id'),
-              node_key: NodeKey.build_from_host_port(ip, node['port'] || node['tls-port']),
+              node_key: NodeKey.build_from_host_port(host, node['port'] || node['tls-port']),
               role: role == 'master' ? role : 'slave',
               primary_id: role == 'master' ? EMPTY_STRING : primary_id,
               slots: role == 'master' ? shard.fetch('slots').each_slice(2).to_a.freeze : EMPTY_ARRAY
@@ -427,6 +427,25 @@ class RedisClient
         end
       end
 
+      # Pick the host for a CLUSTER SHARDS node entry.
+      #
+      # `endpoint` is the server-selected preferred endpoint (driven by the
+      # `cluster-preferred-endpoint-type` config), so prefer it when present and
+      # usable. Some managed services (e.g. AWS ElastiCache Serverless) report
+      # `127.0.0.1` in `ip` while exposing the reachable address only via
+      # `endpoint` / `hostname`; falling through to `ip` in that case would build
+      # an unreachable topology. This mirrors the precedence `parse_node_key`
+      # uses for CLUSTER NODES output (see #207).
+      def pick_shard_host(node)
+        endpoint = node['endpoint']
+        return endpoint if endpoint && !endpoint.empty? && endpoint != '?'
+
+        hostname = node['hostname']
+        return hostname if hostname && !hostname.empty?
+
+        node['ip']
+      end
+
       # As redirection node_key is dependent on `cluster-preferred-endpoint-type` config,
       # node_key should use hostname if present in CLUSTER NODES output.
       #

metadata

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