1 files changed, 19 insertions, 14 deletions

diff --git a/lib/gitlab/issues/rebalancing/state.rb b/lib/gitlab/issues/rebalancing/state.rb
index abb50281f7a..36346564b39 100644
--- a/lib/gitlab/issues/rebalancing/state.rb
+++ b/lib/gitlab/issues/rebalancing/state.rb
@@ -25,7 +25,7 @@ module Gitlab
             redis.multi do |multi|
               # we trigger re-balance for namespaces(groups) or specific user project
               value = "#{rebalanced_container_type}/#{rebalanced_container_id}"
-              multi.sadd(CONCURRENT_RUNNING_REBALANCES_KEY, value)
+              multi.sadd?(CONCURRENT_RUNNING_REBALANCES_KEY, value)
               multi.expire(CONCURRENT_RUNNING_REBALANCES_KEY, REDIS_EXPIRY_TIME)
             end
           end
@@ -99,11 +99,13 @@ module Gitlab
 
         def refresh_keys_expiration
           with_redis do |redis|
-            redis.multi do |multi|
-              multi.expire(issue_ids_key, REDIS_EXPIRY_TIME)
-              multi.expire(current_index_key, REDIS_EXPIRY_TIME)
-              multi.expire(current_project_key, REDIS_EXPIRY_TIME)
-              multi.expire(CONCURRENT_RUNNING_REBALANCES_KEY, REDIS_EXPIRY_TIME)
+            Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
+              redis.multi do |multi|
+                multi.expire(issue_ids_key, REDIS_EXPIRY_TIME)
+                multi.expire(current_index_key, REDIS_EXPIRY_TIME)
+                multi.expire(current_project_key, REDIS_EXPIRY_TIME)
+                multi.expire(CONCURRENT_RUNNING_REBALANCES_KEY, REDIS_EXPIRY_TIME)
+              end
             end
           end
         end
@@ -112,12 +114,14 @@ module Gitlab
           value = "#{rebalanced_container_type}/#{rebalanced_container_id}"
 
           with_redis do |redis|
-            redis.multi do |multi|
-              multi.del(issue_ids_key)
-              multi.del(current_index_key)
-              multi.del(current_project_key)
-              multi.srem(CONCURRENT_RUNNING_REBALANCES_KEY, value)
-              multi.set(self.class.recently_finished_key(rebalanced_container_type, rebalanced_container_id), true, ex: 1.hour)
+            Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
+              redis.multi do |multi|
+                multi.del(issue_ids_key)
+                multi.del(current_index_key)
+                multi.del(current_project_key)
+                multi.srem?(CONCURRENT_RUNNING_REBALANCES_KEY, value)
+                multi.set(self.class.recently_finished_key(rebalanced_container_type, rebalanced_container_id), true, ex: 1.hour)
+              end
             end
           end
         end
@@ -136,9 +140,10 @@ module Gitlab
           current_rebalancing_containers.each do |string|
             container_type, container_id = string.split('/', 2).map(&:to_i)
 
-            if container_type == NAMESPACE
+            case container_type
+            when NAMESPACE
               namespace_ids << container_id
-            elsif container_type == PROJECT
+            when PROJECT
               project_ids << container_id
             end
           end