diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-21 17:33:09 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-21 17:33:09 +0000 |
| commit | b3544dfe115ae596505fd1c6c09981cf33c96ece (patch) | |
| tree | ca19d8b72f04760d9ead27019657f2a4a76c8242 | |
| parent | 6c026c36702254f66473414c2dfbd0a7244069f6 (diff) | |
| parent | eb63889f7cee9ed8f29743330fc793a25db8e50d (diff) | |
| download | gitlab-ce-b3544dfe115ae596505fd1c6c09981cf33c96ece.tar.gz | |
Merge branch 'bvl-transient-failure-health-controller-spec' into 'master'
Don't memoize storage configuration on `FsShardsCheck`
Closes #38140
See merge request gitlab-org/gitlab-ce!14419
| -rw-r--r-- | lib/gitlab/health_checks/fs_shards_check.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/health_checks/fs_shards_check.rb b/lib/gitlab/health_checks/fs_shards_check.rb index a533d4364ef..a1905b091b4 100644 --- a/lib/gitlab/health_checks/fs_shards_check.rb +++ b/lib/gitlab/health_checks/fs_shards_check.rb @@ -58,11 +58,11 @@ module Gitlab end def repository_storages - @repository_storage ||= storages_paths.keys + storages_paths.keys end def storages_paths - @storage_paths ||= Gitlab.config.repositories.storages + Gitlab.config.repositories.storages end def exec_with_timeout(cmd_args, *args, &block) |