Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 2 deletions

diff --git a/lib/gitlab/set_cache.rb b/lib/gitlab/set_cache.rb
index 0927a3e64bb..2e72855824a 100644
--- a/lib/gitlab/set_cache.rb
+++ b/lib/gitlab/set_cache.rb
@@ -14,8 +14,11 @@ module Gitlab
       "#{key}:set"
     end
 
-    def expire(key)
-      with { |redis| redis.del(cache_key(key)) }
+    def expire(*keys)
+      with do |redis|
+        keys = keys.map { |key| cache_key(key) }
+        unlink_or_delete(redis, keys)
+      end
     end
 
     def exist?(key)
@@ -51,5 +54,15 @@ module Gitlab
     def with(&blk)
       Gitlab::Redis::Cache.with(&blk) # rubocop:disable CodeReuse/ActiveRecord
     end
+
+    def unlink_or_delete(redis, keys)
+      if Feature.enabled?(:repository_set_cache_unlink, default_enabled: true)
+        redis.unlink(*keys)
+      else
+        redis.del(*keys)
+      end
+    rescue ::Redis::CommandError
+      redis.del(*keys)
+    end
   end
 end