Refactor fetching healthy shards with Gitlab::HealthChecks::GitalyCheck

There is only 1 `HEALTHY_SHARD_CHECKS` used:
Gitlab::HealthChecks::GitalyCheck

So we can simplify code to get the list of healthy shard names.

1 files changed, 3 insertions, 10 deletions

diff --git a/app/workers/concerns/each_shard_worker.rb b/app/workers/concerns/each_shard_worker.rb
index 202b5759ee9..d0a728fb495 100644
--- a/app/workers/concerns/each_shard_worker.rb
+++ b/app/workers/concerns/each_shard_worker.rb
@@ -2,10 +2,6 @@ module EachShardWorker
   extend ActiveSupport::Concern
   include ::Gitlab::Utils::StrongMemoize
 
-  HEALTHY_SHARD_CHECKS = [
-    Gitlab::HealthChecks::GitalyCheck
-  ].freeze
-
   def each_eligible_shard
     Gitlab::ShardHealthCache.update(eligible_shard_names)
 
@@ -21,18 +17,15 @@ module EachShardWorker
 
   def healthy_shard_names
     strong_memoize(:healthy_shard_names) do
-      # For now, we need to perform both Gitaly and direct filesystem checks to ensure
-      # the shard is healthy. We take the intersection of the successful checks
-      # as the healthy shards.
-      healthy_ready_shards.map { |result| result.labels[:shard] }.compact.uniq
+      healthy_ready_shards.map { |result| result.labels[:shard] }
     end
   end
 
   def healthy_ready_shards
-    ready_shards.map { |result| result.select(&:success) }.inject(:&)
+    ready_shards.select(&:success)
   end
 
   def ready_shards
-    HEALTHY_SHARD_CHECKS.map(&:readiness)
+    Gitlab::HealthChecks::GitalyCheck.readiness
   end
 end