Merge branch 'jv-catfile-limit-test-only' into 'master'

Only use Gitaly catfile_cache_size=5 in test

See merge request gitlab-org/gitlab-ce!29264

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb
index 61fcb562106..0d3e78c0a66 100644
--- a/lib/gitlab/setup_helper.rb
+++ b/lib/gitlab/setup_helper.rb
@@ -43,7 +43,13 @@ module Gitlab
         config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby
         config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
         config[:bin_dir] = Gitlab.config.gitaly.client_path
-        config[:git] = { catfile_cache_size: 5 }
+
+        if Rails.env.test?
+          # Compared to production, tests run in constrained environments. This
+          # number is meant to grow with the number of concurrent rails requests /
+          # sidekiq jobs, and concurrency will be low anyway in test.
+          config[:git] = { catfile_cache_size: 5 }
+        end
 
         TomlRB.dump(config)
       end