Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/avatar_cache.rb b/lib/gitlab/avatar_cache.rb
index 30c8e089061..ed00a279299 100644
--- a/lib/gitlab/avatar_cache.rb
+++ b/lib/gitlab/avatar_cache.rb
@@ -65,7 +65,13 @@ module Gitlab
           keys = emails.map { |email| email_key(email) }
 
           Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
-            redis.unlink(*keys)
+            if ::Feature.enabled?(:use_pipeline_over_multikey)
+              redis.pipelined do |pipeline|
+                keys.each { |key| pipeline.unlink(key) }
+              end.sum
+            else
+              redis.unlink(*keys)
+            end
           end
         end
       end