From ec5ceae623fceff0a959c7d297970d37285532dc Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 19 Jul 2019 10:01:09 -0700 Subject: Fix Gitaly auto-detection caching If `GitalyClient#can_use_disk?` returned `false`, it was never cached properly and led to excessive number of Gitaly calls. Instead of using `cached_value.present?`, we need to check `cached_value.nil?`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64802 --- lib/gitlab/gitaly_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index e7319a7b7f0..c98de722fe1 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -392,7 +392,7 @@ module Gitlab @can_use_disk[storage] end - return cached_value if cached_value.present? + return cached_value unless cached_value.nil? gitaly_filesystem_id = filesystem_id(storage) direct_filesystem_id = filesystem_id_from_disk(storage) -- cgit v1.2.3