Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 22 deletions

diff --git a/lib/gitlab/health_checks/gitaly_check.rb b/lib/gitlab/health_checks/gitaly_check.rb
index 2bd8ea711b5..f5f142c251f 100644
--- a/lib/gitlab/health_checks/gitaly_check.rb
+++ b/lib/gitlab/health_checks/gitaly_check.rb
@@ -27,35 +27,17 @@ module Gitlab
         end
 
         def check(storage_name)
-          storage_healthy = healthy(storage_name)
-          unless storage_healthy[:success]
-            return HealthChecks::Result.new(
-              name,
-              storage_healthy[:success],
-              storage_healthy[:message],
-              shard: storage_name
-            )
-          end
+          serv = Gitlab::GitalyClient::HealthCheckService.new(storage_name)
+          result = serv.check
 
-          storage_ready = ready(storage_name)
           HealthChecks::Result.new(
             name,
-            storage_ready[:success],
-            storage_ready[:message],
+            result[:success],
+            result[:message],
             shard: storage_name
           )
         end
 
-        def healthy(storage_name)
-          serv = Gitlab::GitalyClient::HealthCheckService.new(storage_name)
-          serv.check
-        end
-
-        def ready(storage_name)
-          serv = Gitlab::GitalyClient::ServerService.new(storage_name)
-          serv.readiness_check
-        end
-
         private
 
         def metric_prefix