From aca89cb7e933eca98b794cbd5457ffabd54b43f7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 4 Aug 2020 15:09:27 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/gitlab/set_cache.rb | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'lib/gitlab/set_cache.rb') diff --git a/lib/gitlab/set_cache.rb b/lib/gitlab/set_cache.rb index 6ba9ee26634..591265d014e 100644 --- a/lib/gitlab/set_cache.rb +++ b/lib/gitlab/set_cache.rb @@ -22,7 +22,7 @@ module Gitlab keys = keys.map { |key| cache_key(key) } Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do - unlink_or_delete(redis, keys) + redis.unlink(*keys) end end end @@ -60,17 +60,5 @@ 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 => e - Gitlab::ErrorTracking.log_exception(e) - - redis.del(*keys) - end end end -- cgit v1.2.3