Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 1 deletions

diff --git a/lib/gitlab/instrumentation/redis_base.rb b/lib/gitlab/instrumentation/redis_base.rb
index 3ee8768d509..00a7387afe2 100644
--- a/lib/gitlab/instrumentation/redis_base.rb
+++ b/lib/gitlab/instrumentation/redis_base.rb
@@ -118,6 +118,14 @@ module Gitlab
           @exception_counter.increment({ storage: storage_key, exception: ex.class.to_s })
         end
 
+        def instance_count_cluster_redirection(ex)
+          # This metric is meant to give a client side view of how often are commands
+          # redirected to the right node, especially during resharding..
+          # This metric can be used for Redis alerting and service health monitoring.
+          @redirection_counter ||= Gitlab::Metrics.counter(:gitlab_redis_client_redirections_total, 'Client side Redis Cluster redirection count, per Redis node, per slot')
+          @redirection_counter.increment(decompose_redirection_message(ex.message).merge({ storage: storage_key }))
+        end
+
         def instance_observe_duration(duration)
           @request_latency_histogram ||= Gitlab::Metrics.histogram(
             :gitlab_redis_client_requests_duration_seconds,
@@ -166,6 +174,11 @@ module Gitlab
         def build_key(namespace)
           "#{storage_key}_#{namespace}"
         end
+
+        def decompose_redirection_message(err_msg)
+          redirection_type, _, target_node_key = err_msg.split
+          { redirection_type: redirection_type, target_node_key: target_node_key }
+        end
       end
     end
   end
diff --git a/lib/gitlab/instrumentation/redis_interceptor.rb b/lib/gitlab/instrumentation/redis_interceptor.rb
index 82531883810..2a86b9e4202 100644
--- a/lib/gitlab/instrumentation/redis_interceptor.rb
+++ b/lib/gitlab/instrumentation/redis_interceptor.rb
@@ -40,7 +40,12 @@ module Gitlab
 
         yield
       rescue ::Redis::BaseError => ex
-        instrumentation_class.instance_count_exception(ex)
+        if ex.message.start_with?('MOVED', 'ASK')
+          instrumentation_class.instance_count_cluster_redirection(ex)
+        else
+          instrumentation_class.instance_count_exception(ex)
+        end
+
         instrumentation_class.log_exception(ex)
         raise ex
       ensure