Commit b00aaece authored by Nick Thomas's avatar Nick Thomas

Fix the filesystem shard health check to check all configured shards

parent 1f491154
---
title: Fix the filesystem shard health check to check all configured shards
merge_request: 14341
author:
type: fixed
...@@ -58,7 +58,7 @@ module Gitlab ...@@ -58,7 +58,7 @@ module Gitlab
end end
def repository_storages def repository_storages
@repository_storage ||= Gitlab::CurrentSettings.current_application_settings.repository_storages @repository_storage ||= storages_paths.keys
end end
def storages_paths def storages_paths
......
...@@ -10,6 +10,7 @@ describe HealthController do ...@@ -10,6 +10,7 @@ describe HealthController do
before do before do
allow(Settings.monitoring).to receive(:ip_whitelist).and_return([whitelisted_ip]) 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') stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment