redis-cluster-client 0.13.4 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2879675038f9d7ac3f0857f89fef3929453ae927877cc220f7f488535bbbe8ba
-  data.tar.gz: 56cbc27612c379f097066e600189aceaa7b9d62b7e0690ffda9b0392e17b0916
+  metadata.gz: 3e6204d25c8bc31540498f0fa7e3a8795d1a8ac35b1fe9c429a40512fa1f0702
+  data.tar.gz: 0ae970fff2f4b4f76fe72403bf66be39eabf0d5e74186b5093102210d22ab512
 SHA512:
-  metadata.gz: dd73c96b5e0fcd5ae239ed8b487c8fa8118eeea9c671a1bf056feaa5832d0ff79230fc23245a319fd1af957d60472c3f891da64f840401b35576f441ded5e90e
-  data.tar.gz: f17a9bc4c394ae9c691030f55774397fbb22d3008cdb0784003864275cb4184b3a73097d57c396715348fbdfe9d76a44a181395020afa5920540ffaa60cb6328
+  metadata.gz: f2ac7ad893b9102168b6a53da0dee3f8bc171240cf3fc98db9e9f99aa49f48b67744c6fac16d7fabed1e1699e86e1386155728ec61b4b5980f4a897826f77ea4
+  data.tar.gz: 82c3da07a56c0f2ac56434c982a0e8bb22f129545049bab135849b656c59aa38f3f54f0b1d687df05dcb3a78b544f74f92a91d4cf656c0e481820a8525e5f33a

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

@@ -10,6 +10,10 @@ class RedisClient
       # 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.
       class Pooled
+        IO_ERROR_NEVER = { IOError => :never }.freeze
+        IO_ERROR_IMMEDIATE = { IOError => :immediate }.freeze
+        private_constant :IO_ERROR_NEVER, :IO_ERROR_IMMEDIATE
+
         def initialize(size:)
           raise ArgumentError, "size must be positive: #{size}" unless size.positive?
 
@@ -33,7 +37,9 @@ class RedisClient
 
         def close
           @q.clear
-          @workers.each { |t| t&.exit }
+          workers = @workers.compact
+          workers.each(&:exit)
+          workers.each(&:join)
           @workers.clear
           @q.close
           @pid = nil
@@ -65,7 +71,15 @@ class RedisClient
 
         def spawn_worker
           Thread.new(@q) do |q|
-            loop { q.pop.exec }
+            Thread.handle_interrupt(IO_ERROR_NEVER) do
+              loop do
+                Thread.handle_interrupt(IO_ERROR_IMMEDIATE) do
+                  q.pop.exec
+                end
+              end
+            end
+          rescue IOError
+            # stream closed in another thread
           end
         end
       end

data/lib/redis_client/cluster/pub_sub.rb

@@ -7,6 +7,10 @@ class RedisClient
   class Cluster
     class PubSub
       class State
+        IO_ERROR_NEVER = { IOError => :never }.freeze
+        IO_ERROR_IMMEDIATE = { IOError => :immediate }.freeze
+        private_constant :IO_ERROR_NEVER, :IO_ERROR_IMMEDIATE
+
         def initialize(client, queue)
           @client = client
           @worker = nil
@@ -22,7 +26,11 @@ class RedisClient
         end
 
         def close
-          @worker.exit if @worker&.alive?
+          if @worker&.alive?
+            @worker.exit
+            @worker.join
+          end
+
           @client.close
         rescue ::RedisClient::ConnectionError
           # ignore
@@ -35,21 +43,24 @@ class RedisClient
           # 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, 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
+            Thread.handle_interrupt(IO_ERROR_NEVER) do
+              loop do
+                Thread.handle_interrupt(IO_ERROR_IMMEDIATE) { 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
+
+                Thread.handle_interrupt(IO_ERROR_IMMEDIATE) { q << e }
+                prev_err = e
+              end
             end
+          rescue IOError
+            # stream closed in another thread
           end
         end
       end
 
       BUF_SIZE = Integer(ENV.fetch('REDIS_CLIENT_PUBSUB_BUF_SIZE', 1024))
-
       private_constant :BUF_SIZE
 
       def initialize(router, command_builder)

data/lib/redis_client/cluster_config.rb

@@ -69,10 +69,18 @@ class RedisClient
       "#<#{self.class.name} #{startup_nodes.values.map { |v| v.reject { |k| k == :command_builder } }}>"
     end
 
+    def connect_timeout
+      @client_config[:connect_timeout] || @client_config[:timeout] || ::RedisClient::Config::DEFAULT_TIMEOUT
+    end
+
     def read_timeout
       @client_config[:read_timeout] || @client_config[:timeout] || ::RedisClient::Config::DEFAULT_TIMEOUT
     end
 
+    def write_timeout
+      @client_config[:write_timeout] || @client_config[:timeout] || ::RedisClient::Config::DEFAULT_TIMEOUT
+    end
+
     def new_pool(size: 5, timeout: 5, **kwargs)
       @client_implementation.new(
         self,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster-client
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.6
 platform: ruby
 authors:
 - Taishi Kasuga
 bindir: bin
 cert_chain: []
-date: 2025-03-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Redis cluster-aware client for Ruby
 test_files: []