Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

2 files changed, 7 insertions, 8 deletions

diff --git a/lib/gitlab/instrumentation/redis_base.rb b/lib/gitlab/instrumentation/redis_base.rb
index 00a7387afe2..70aaa59f912 100644
--- a/lib/gitlab/instrumentation/redis_base.rb
+++ b/lib/gitlab/instrumentation/redis_base.rb
@@ -94,9 +94,9 @@ module Gitlab
             raise RedisClusterValidator::CrossSlotError, "Redis command #{result[:command_name]} arguments hash to different slots. See https://docs.gitlab.com/ee/development/redis.html#multi-key-commands"
           end
 
-          increment_allowed_cross_slot_request_count if result[:allowed]
+          increment_allowed_cross_slot_request_count if result[:allowed] && !result[:valid]
 
-          result[:valid]
+          result[:valid] || result[:allowed]
         end
 
         def enable_redis_cluster_validation
diff --git a/lib/gitlab/instrumentation/redis_cluster_validator.rb b/lib/gitlab/instrumentation/redis_cluster_validator.rb
index 1567e54d8da..948132e6edd 100644
--- a/lib/gitlab/instrumentation/redis_cluster_validator.rb
+++ b/lib/gitlab/instrumentation/redis_cluster_validator.rb
@@ -193,8 +193,7 @@ module Gitlab
           keys = commands.map { |command| extract_keys(command) }.flatten
 
           {
-            # calculate key-slots only if not allowed
-            valid: allow_cross_slot_commands? || !has_cross_slot_keys?(keys),
+            valid: !has_cross_slot_keys?(keys),
             command_name: command_name,
             key_count: keys.size,
             allowed: allow_cross_slot_commands?
@@ -211,6 +210,10 @@ module Gitlab
           Thread.current[:allow_cross_slot_commands] -= 1
         end
 
+        def allow_cross_slot_commands?
+          Thread.current[:allow_cross_slot_commands].to_i > 0
+        end
+
         private
 
         def extract_keys(command)
@@ -226,10 +229,6 @@ module Gitlab
           keys.map { |key| key_slot(key) }.uniq.many? # rubocop: disable CodeReuse/ActiveRecord
         end
 
-        def allow_cross_slot_commands?
-          Thread.current[:allow_cross_slot_commands].to_i > 0
-        end
-
         def key_slot(key)
           ::Redis::Cluster::KeySlotConverter.convert(extract_hash_tag(key))
         end