Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 6 insertions, 8 deletions

diff --git a/lib/gitlab/reactive_cache_set_cache.rb b/lib/gitlab/reactive_cache_set_cache.rb
index 8a432edbd78..e62e1172b65 100644
--- a/lib/gitlab/reactive_cache_set_cache.rb
+++ b/lib/gitlab/reactive_cache_set_cache.rb
@@ -11,12 +11,16 @@ module Gitlab
     end
 
     def cache_key(key)
-      "#{cache_type}:#{key}:set"
+      "#{cache_namespace}:#{key}:set"
+    end
+
+    def new_cache_key(key)
+      super(key)
     end
 
     def clear_cache!(key)
       with do |redis|
-        keys = read(key).map { |value| "#{cache_type}:#{value}" }
+        keys = read(key).map { |value| "#{cache_namespace}:#{value}" }
         keys << cache_key(key)
 
         redis.pipelined do
@@ -24,11 +28,5 @@ module Gitlab
         end
       end
     end
-
-    private
-
-    def cache_type
-      Gitlab::Redis::Cache::CACHE_NAMESPACE
-    end
   end
 end