1 files changed, 5 insertions, 14 deletions
diff --git a/lib/gitlab/redis/cache.rb b/lib/gitlab/redis/cache.rb
index 60944268f91..d63905cd896 100644
--- a/lib/gitlab/redis/cache.rb
+++ b/lib/gitlab/redis/cache.rb
@@ -8,9 +8,14 @@ module Gitlab
       class << self
         # Full list of options:
         # https://api.rubyonrails.org/classes/ActiveSupport/Cache/RedisCacheStore.html#method-c-new
+        # pool argument event not documented in the link above is handled by RedisCacheStore see:
+        # https://github.com/rails/rails/blob/593893c901f87b4ed205751f72df41519b4d2da3/activesupport/lib/active_support/cache/redis_cache_store.rb#L165
+        # and
+        # https://github.com/rails/rails/blob/ad790cb2f6bc724a89e4266b505b3c57d5089dae/activesupport/lib/active_support/cache.rb#L206
         def active_support_config
           {
             redis: pool,
+            pool: false,
             compress: Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_REDIS_CACHE_COMPRESSION', '1')),
             namespace: CACHE_NAMESPACE,
             expires_in: default_ttl_seconds
@@ -20,20 +25,6 @@ module Gitlab
         def default_ttl_seconds
           ENV.fetch('GITLAB_RAILS_CACHE_DEFAULT_TTL_SECONDS', 8.hours).to_i
         end
-
-        # Exposes redis for Peek adapter. To be removed after ClusterCache migration.
-        def multistore_redis
-          redis
-        end
-
-        private
-
-        def redis
-          primary_store = ::Redis.new(Gitlab::Redis::ClusterCache.params)
-          secondary_store = ::Redis.new(params)
-
-          MultiStore.new(primary_store, secondary_store, store_name)
-        end
       end
     end
   end