Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/gitlab/manifest_import/metadata.rb b/lib/gitlab/manifest_import/metadata.rb
index 6fe9bb10cdf..3747431c6a7 100644
--- a/lib/gitlab/manifest_import/metadata.rb
+++ b/lib/gitlab/manifest_import/metadata.rb
@@ -14,9 +14,11 @@ module Gitlab
 
       def save(repositories, group_id)
         Gitlab::Redis::SharedState.with do |redis|
-          redis.multi do |multi|
-            multi.set(key_for('repositories'), Gitlab::Json.dump(repositories), ex: EXPIRY_TIME)
-            multi.set(key_for('group_id'), group_id, ex: EXPIRY_TIME)
+          Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
+            redis.multi do |multi|
+              multi.set(key_for('repositories'), Gitlab::Json.dump(repositories), ex: EXPIRY_TIME)
+              multi.set(key_for('group_id'), group_id, ex: EXPIRY_TIME)
+            end
           end
         end
       end