1 files changed, 4 insertions, 6 deletions
diff --git a/lib/gitlab/reactive_cache_set_cache.rb b/lib/gitlab/reactive_cache_set_cache.rb
index dc13bb927e6..9f5769a5c97 100644
--- a/lib/gitlab/reactive_cache_set_cache.rb
+++ b/lib/gitlab/reactive_cache_set_cache.rb
@@ -11,17 +11,15 @@ module Gitlab
     end
 
     def clear_cache!(key)
-      use_pipeline = ::Feature.enabled?(:use_pipeline_over_multikey)
-
       with do |redis|
         keys = read(key).map { |value| "#{cache_namespace}:#{value}" }
         keys << cache_key(key)
 
         Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
-          redis.pipelined do |pipeline|
-            if use_pipeline
-              keys.each { |key| pipeline.unlink(key) }
-            else
+          if Gitlab::Redis::ClusterUtil.cluster?(redis)
+            Gitlab::Redis::ClusterUtil.batch_unlink(keys, redis)
+          else
+            redis.pipelined do |pipeline|
               keys.each_slice(1000) { |subset| pipeline.unlink(*subset) }
             end
           end