Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

1 files changed, 5 insertions, 7 deletions

diff --git a/lib/gitlab/discussions_diff/highlight_cache.rb b/lib/gitlab/discussions_diff/highlight_cache.rb
index df93e6e91b4..18ff7c28e17 100644
--- a/lib/gitlab/discussions_diff/highlight_cache.rb
+++ b/lib/gitlab/discussions_diff/highlight_cache.rb
@@ -16,7 +16,7 @@ module Gitlab
         def write_multiple(mapping)
           with_redis do |redis|
             Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
-              redis.pipelined do |pipelined|
+              Gitlab::Redis::CrossSlot::Pipeline.new(redis).pipelined do |pipelined|
                 mapping.each do |raw_key, value|
                   key = cache_key_for(raw_key)
 
@@ -41,8 +41,8 @@ module Gitlab
           content =
             with_redis do |redis|
               Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
-                if ::Feature.enabled?(:use_pipeline_over_multikey)
-                  redis.pipelined do |pipeline|
+                if Gitlab::Redis::ClusterUtil.cluster?(redis)
+                  Gitlab::Redis::CrossSlot::Pipeline.new(redis).pipelined do |pipeline|
                     keys.each { |key| pipeline.get(key) }
                   end
                 else
@@ -72,10 +72,8 @@ module Gitlab
 
           with_redis do |redis|
             Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
-              if ::Feature.enabled?(:use_pipeline_over_multikey)
-                redis.pipelined do |pipeline|
-                  keys.each { |key| pipeline.del(key) }
-                end.sum
+              if Gitlab::Redis::ClusterUtil.cluster?(redis)
+                Gitlab::Redis::ClusterUtil.batch_unlink(keys, redis)
               else
                 redis.del(keys)
               end