Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

3 files changed, 37 insertions, 42 deletions

diff --git a/lib/gitlab/health_checks/redis/redis_check.rb b/lib/gitlab/health_checks/redis/redis_check.rb
index f7e46fce134..44b85bf886e 100644
--- a/lib/gitlab/health_checks/redis/redis_check.rb
+++ b/lib/gitlab/health_checks/redis/redis_check.rb
@@ -20,7 +20,8 @@ module Gitlab
           def check
             ::Gitlab::HealthChecks::Redis::CacheCheck.check_up &&
               ::Gitlab::HealthChecks::Redis::QueuesCheck.check_up &&
-              ::Gitlab::HealthChecks::Redis::SharedStateCheck.check_up
+              ::Gitlab::HealthChecks::Redis::SharedStateCheck.check_up &&
+              ::Gitlab::HealthChecks::Redis::TraceChunksCheck.check_up
           end
         end
       end
diff --git a/lib/gitlab/health_checks/redis/trace_chunks_check.rb b/lib/gitlab/health_checks/redis/trace_chunks_check.rb
new file mode 100644
index 00000000000..cf9fa700b0a
--- /dev/null
+++ b/lib/gitlab/health_checks/redis/trace_chunks_check.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module HealthChecks
+    module Redis
+      class TraceChunksCheck
+        extend SimpleAbstractCheck
+
+        class << self
+          def check_up
+            check
+          end
+
+          private
+
+          def metric_prefix
+            'redis_trace_chunks_ping'
+          end
+
+          def successful?(result)
+            result == 'PONG'
+          end
+
+          # rubocop: disable CodeReuse/ActiveRecord
+          def check
+            catch_timeout 10.seconds do
+              Gitlab::Redis::TraceChunks.with(&:ping)
+            end
+          end
+          # rubocop: enable CodeReuse/ActiveRecord
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/health_checks/unicorn_check.rb b/lib/gitlab/health_checks/unicorn_check.rb
deleted file mode 100644
index f0c6fdab600..00000000000
--- a/lib/gitlab/health_checks/unicorn_check.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module HealthChecks
-    # This check can only be run on Unicorn `master` process
-    class UnicornCheck
-      extend SimpleAbstractCheck
-
-      class << self
-        include Gitlab::Utils::StrongMemoize
-
-        private
-
-        def metric_prefix
-          'unicorn_check'
-        end
-
-        def successful?(result)
-          result > 0
-        end
-
-        def check
-          return unless http_servers
-
-          http_servers.sum(&:worker_processes)
-        end
-
-        # Traversal of ObjectSpace is expensive, on fully loaded application
-        # it takes around 80ms. The instances of HttpServers are not a subject
-        # to change so we can cache the list of servers.
-        def http_servers
-          strong_memoize(:http_servers) do
-            next unless Gitlab::Runtime.unicorn?
-
-            ObjectSpace.each_object(::Unicorn::HttpServer).to_a
-          end
-        end
-      end
-    end
-  end
-end