Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
b00aaece
Commit
b00aaece
authored
Sep 18, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the filesystem shard health check to check all configured shards
parent
1f491154
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
changelogs/unreleased/37999-fix-circuit-breaker.yml
changelogs/unreleased/37999-fix-circuit-breaker.yml
+5
-0
lib/gitlab/health_checks/fs_shards_check.rb
lib/gitlab/health_checks/fs_shards_check.rb
+1
-1
spec/controllers/health_controller_spec.rb
spec/controllers/health_controller_spec.rb
+1
-0
No files found.
changelogs/unreleased/37999-fix-circuit-breaker.yml
0 → 100644
View file @
b00aaece
---
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
View file @
b00aaece
...
@@ -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_storage
s
@repository_storage
||=
storages_paths
.
key
s
end
end
def
storages_paths
def
storages_paths
...
...
spec/controllers/health_controller_spec.rb
View file @
b00aaece
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment