Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/gitlab/markdown_cache/redis/store.rb b/lib/gitlab/markdown_cache/redis/store.rb
index fd5870fa842..8cab069e1bf 100644
--- a/lib/gitlab/markdown_cache/redis/store.rb
+++ b/lib/gitlab/markdown_cache/redis/store.rb
@@ -10,9 +10,11 @@ module Gitlab
           results = {}
 
           Gitlab::Redis::Cache.with do |r|
-            r.pipelined do |pipeline|
-              subjects.each do |subject|
-                results[subject.cache_key] = new(subject).read(pipeline)
+            Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
+              r.pipelined do |pipeline|
+                subjects.each do |subject|
+                  results[subject.cache_key] = new(subject).read(pipeline)
+                end
               end
             end
           end