Merge pull request rails#53868 from joshuay03/consider-connection-pool-wrap-in-redis-cache-store

Also handle `ConnectionPool::Wrapper` objects in `RedisCacheStore`

Author: byroot

activesupport/lib/active_support/cache/redis_cache_store.rb

@@ -158,8 +158,11 @@ def build_redis_client(**redis_options)
       #   cache.exist?('bar') # => false
       def initialize(error_handler: DEFAULT_ERROR_HANDLER, **redis_options)
         universal_options = redis_options.extract!(*UNIVERSAL_OPTIONS)
+        redis = redis_options[:redis]
+
+        already_pool = redis.instance_of?(::ConnectionPool) ||
+                       (redis.respond_to?(:wrapped_pool) && redis.wrapped_pool.instance_of?(::ConnectionPool))
 
-        already_pool = redis_options[:redis].instance_of?(::ConnectionPool)
         if !already_pool && pool_options = self.class.send(:retrieve_pool_options, redis_options)
           @redis = ::ConnectionPool.new(pool_options) { self.class.build_redis(**redis_options) }
         else

activesupport/test/cache/stores/redis_cache_store_test.rb

@@ -328,7 +328,7 @@ def test_connection_pooling_by_default
       assert_equal 5, pool.instance_variable_get(:@timeout)
     end
 
-    def test_no_connection_pooling_by_default_when_already_pool
+    def test_no_connection_pooling_by_default_when_already_a_pool
       redis = ::ConnectionPool.new(size: 10, timeout: 2.5) { Redis.new }
       cache = ActiveSupport::Cache.lookup_store(:redis_cache_store, redis: redis)
       pool = cache.redis
@@ -338,6 +338,18 @@ def test_no_connection_pooling_by_default_when_already_pool
       assert_equal 2.5, pool.instance_variable_get(:@timeout)
     end
 
+    def test_no_connection_pooling_by_default_when_already_wrapped_in_a_pool
+      redis = ::ConnectionPool::Wrapper.new(size: 10, timeout: 2.5) { Redis.new }
+      cache = ActiveSupport::Cache.lookup_store(:redis_cache_store, redis: redis)
+      wrapped_redis = cache.redis
+      assert_kind_of ::Redis, wrapped_redis
+      assert_same redis, wrapped_redis
+      pool = wrapped_redis.wrapped_pool
+      assert_kind_of ::ConnectionPool, pool
+      assert_equal 10, pool.size
+      assert_equal 2.5, pool.instance_variable_get(:@timeout)
+    end
+
     private
       def store
         [:redis_cache_store]