Commit 4c6c1059 authored by Douwe Maan's avatar Douwe Maan

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

Fix the filesystem shard health check to check all configured shards

Closes #37999

See merge request gitlab-org/gitlab-ce!14341
parents 2973c1b2 b00aaece
---
title: Fix the filesystem shard health check to check all configured shards
merge_request: 14341
author:
type: fixed
......@@ -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
......
......@@ -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
......
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