1 files changed, 10 insertions, 7 deletions
diff --git a/lib/gitlab/manifest_import/metadata.rb b/lib/gitlab/manifest_import/metadata.rb
index 3747431c6a7..81711be729e 100644
--- a/lib/gitlab/manifest_import/metadata.rb
+++ b/lib/gitlab/manifest_import/metadata.rb
@@ -4,6 +4,7 @@ module Gitlab
   module ManifestImport
     class Metadata
       EXPIRY_TIME = 1.week
+      KEY_PREFIX = 'manifest_import:metadata:user'
 
       attr_reader :user, :fallback
 
@@ -14,11 +15,9 @@ module Gitlab
 
       def save(repositories, group_id)
         Gitlab::Redis::SharedState.with do |redis|
-          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
+          redis.multi do |multi|
+            multi.set(hashtag_key_for('repositories'), Gitlab::Json.dump(repositories), ex: EXPIRY_TIME)
+            multi.set(hashtag_key_for('group_id'), group_id, ex: EXPIRY_TIME)
           end
         end
       end
@@ -37,13 +36,17 @@ module Gitlab
 
       private
 
+      def hashtag_key_for(field)
+        "#{KEY_PREFIX}:{#{user.id}}:#{field}"
+      end
+
       def key_for(field)
-        "manifest_import:metadata:user:#{user.id}:#{field}"
+        "#{KEY_PREFIX}:#{user.id}:#{field}"
       end
 
       def redis_get(field)
         Gitlab::Redis::SharedState.with do |redis|
-          redis.get(key_for(field))
+          redis.get(hashtag_key_for(field)) || redis.get(key_for(field))
         end
       end
     end