Fix the filesystem shard health check to check all configured shards

This commit is contained in:
Nick Thomas 2017-09-18 17:13:49 +01:00
parent 1f4911541d
commit b00aaeced7
3 changed files with 7 additions and 1 deletions

View file

@ -0,0 +1,5 @@
---
title: Fix the filesystem shard health check to check all configured shards
merge_request: 14341
author:
type: fixed

View file

@ -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

View file

@ -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