Merge branch '37999-fix-circuit-breaker' into 'master'

changelogs/unreleased/37999-fix-circuit-breaker.yml

+---
+title: Fix the filesystem shard health check to check all configured shards
+merge_request: 14341
+author:
+type: fixed

lib/gitlab/health_checks/fs_shards_check.rb

@@ -58,7 +58,7 @@ module Gitlab
         end
 
         def repository_storages
-          @repository_storage ||= Gitlab::CurrentSettings.current_application_settings.repository_storages
+          @repository_storage ||= storages_paths.keys
         end
 
         def storages_paths

spec/controllers/health_controller_spec.rb

@@ -10,6 +10,7 @@ describe HealthController do
 
   before do
     allow(Settings.monitoring).to receive(:ip_whitelist).and_return([whitelisted_ip])
+    stub_storage_settings({}) # Hide the broken storage
     stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
   end