redis-cluster-client 0.11.3 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a18bda4b076ac6a39e7558b39b0ff5f443e2f9d192ff45ee6749e64b3a349fbd
-  data.tar.gz: ed166898e6dbb23b316d87162767fe06eb34440029bdb6f33764c58038c20d88
+  metadata.gz: 175bb2bf9b82d2b1d0b95e8d7e3e74e3952165f2edea957303f8b16716a17273
+  data.tar.gz: 1e094b0d0ae859cb4d77cc872203c21f2f408b739a748d518fd60ca7c33e7451
 SHA512:
-  metadata.gz: 7b1ca4265e58d3d4cdb00c0ad9629d72dec6c1a0681d34663e38adb147a0d66985be3f4257d6f6d0c62752cda0f710bfd9e7eb9f3694e07ec4796ce99677c148
-  data.tar.gz: 178592be6e79bfdf2c5288f558fca21116aabd98cc10b4436298393d22f895844523b3e32f28635172229a404c55d83e52e242230677ab00d509dba7d70adc0c
+  metadata.gz: 8b8a13a4df4b5d96da3bcb618bada62d5882fb688b7fd7a9d618c6733a44913af24222c48d40f4db0a316d58b00aa608de99467114dac22711eb7b421f7e2e8a
+  data.tar.gz: 2c3ebd371f3a23388e6600192a6403c5f97a90f7a7c06bab747310fa729d8be8f9d7d793763a8e7829f2e4699893d76964a96bd0ea40e727d0bdb499e1ef9f67

data/lib/redis_client/cluster/errors.rb

@@ -37,8 +37,8 @@ class RedisClient
         end
 
         @errors = errors
-        messages = @errors.map { |node_key, error| "#{node_key}: #{error.message}" }
-        super("Errors occurred on any node: #{messages.join(', ')}")
+        messages = @errors.map { |node_key, error| "#{node_key}: (#{error.class}) #{error.message}" }
+        super(messages.join(', '))
       end
     end
 

data/lib/redis_client/cluster/node.rb

@@ -309,7 +309,7 @@ class RedisClient
           work_group.push(i, raw_client) do |client|
             regular_timeout = client.read_timeout
             client.read_timeout = @config.slow_command_timeout > 0.0 ? @config.slow_command_timeout : regular_timeout
-            reply = client.call('CLUSTER', 'NODES')
+            reply = client.call_once('CLUSTER', 'NODES')
             client.read_timeout = regular_timeout
             parse_cluster_node_reply(reply)
           rescue StandardError => e

data/lib/redis_client/cluster/optimistic_locking.rb

@@ -33,7 +33,7 @@ class RedisClient
                 raise
               end
             rescue ::RedisClient::CommandError => e
-              @router.renew_cluster_state if e.message.start_with?('CLUSTERDOWN Hash slot not served')
+              @router.renew_cluster_state if e.message.start_with?('CLUSTERDOWN')
               raise
             end
           rescue ::RedisClient::ConnectionError

data/lib/redis_client/cluster/pipeline.rb

@@ -73,7 +73,7 @@ class RedisClient
                 first_exception ||= result
               end
 
-              stale_cluster_state = true if result.message.start_with?('CLUSTERDOWN Hash slot not served')
+              stale_cluster_state = true if result.message.start_with?('CLUSTERDOWN')
             end
 
             results[index] = result

data/lib/redis_client/cluster/pub_sub.rb

@@ -35,11 +35,15 @@ class RedisClient
           # Ruby VM allocates 1 MB memory as a stack for a thread.
           # It is a fixed size but we can modify the size with some environment variables.
           # So it consumes memory 1 MB multiplied a number of workers.
-          Thread.new(client, queue) do |pubsub, q|
+          Thread.new(client, queue, nil) do |pubsub, q, prev_err|
             loop do
               q << pubsub.next_event
+              prev_err = nil
             rescue StandardError => e
+              next sleep 0.005 if e.instance_of?(prev_err.class) && e.message == prev_err&.message
+
               q << e
+              prev_err = e
             end
           end
         end
@@ -90,11 +94,10 @@ class RedisClient
 
           case event = @queue.pop(true)
           when ::RedisClient::CommandError
-            raise event unless event.message.start_with?('MOVED', 'CLUSTERDOWN Hash slot not served')
+            raise event unless event.message.start_with?('MOVED', 'CLUSTERDOWN')
 
             break start_over
-          when ::RedisClient::ConnectionError
-            break start_over
+          when ::RedisClient::ConnectionError then break start_over
           when StandardError then raise event
           when Array then break event
           end
@@ -161,7 +164,6 @@ class RedisClient
           @router.renew_cluster_state
           @state_dict.each_value(&:close)
           @state_dict.clear
-          @queue.clear
           @commands.each { |command| _call(command) }
           break
         rescue ::RedisClient::ConnectionError, ::RedisClient::Cluster::NodeMightBeDown

data/lib/redis_client/cluster/router.rb

@@ -74,7 +74,7 @@ class RedisClient
         renew_cluster_state
         raise
       rescue ::RedisClient::CommandError => e
-        renew_cluster_state if e.message.start_with?('CLUSTERDOWN Hash slot not served')
+        renew_cluster_state if e.message.start_with?('CLUSTERDOWN')
         raise
       rescue ::RedisClient::Cluster::ErrorCollection => e
         raise if e.errors.any?(::RedisClient::CircuitBreaker::OpenCircuitError)
@@ -82,7 +82,7 @@ class RedisClient
         renew_cluster_state if e.errors.values.any? do |err|
           next false if ::RedisClient::Cluster::ErrorIdentification.identifiable?(err) && @node.none? { |c| ::RedisClient::Cluster::ErrorIdentification.client_owns_error?(err, c) }
 
-          err.message.start_with?('CLUSTERDOWN Hash slot not served') || err.is_a?(::RedisClient::ConnectionError)
+          err.message.start_with?('CLUSTERDOWN') || err.is_a?(::RedisClient::ConnectionError)
         end
 
         raise
@@ -123,7 +123,7 @@ class RedisClient
             node.call('ASKING')
             retry
           end
-        elsif e.message.start_with?('CLUSTERDOWN Hash slot not served')
+        elsif e.message.start_with?('CLUSTERDOWN')
           renew_cluster_state
           retry if retry_count >= 0
         end

data/lib/redis_client/cluster/transaction.rb

@@ -170,7 +170,7 @@ class RedisClient
         elsif err.message.start_with?('ASK')
           node = @router.assign_asking_node(err.message)
           try_asking(node) ? send_transaction(node, redirect: redirect - 1) : err
-        elsif err.message.start_with?('CLUSTERDOWN Hash slot not served')
+        elsif err.message.start_with?('CLUSTERDOWN')
           @router.renew_cluster_state if @watching_slot.nil?
           raise err
         else

data/lib/redis_client/cluster.rb

@@ -15,10 +15,10 @@ class RedisClient
 
     attr_reader :config
 
-    def initialize(config, pool: nil, concurrency: nil, **kwargs)
-      @config = config
+    def initialize(config = nil, pool: nil, concurrency: nil, **kwargs)
+      @config = config.nil? ? ClusterConfig.new(**kwargs) : config
       @concurrent_worker = ::RedisClient::Cluster::ConcurrentWorker.create(**(concurrency || {}))
-      @command_builder = config.command_builder
+      @command_builder = @config.command_builder
 
       @pool = pool
       @kwargs = kwargs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.5
 platform: ruby
 authors:
 - Taishi Kasuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-27 00:00:00.000000000 Z
+date: 2024-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client