diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2019-06-06 11:31:11 +0200 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-06-06 12:07:18 +0200 |
commit | 043b3a1dc5afb178267934e38f08669b6a3a4039 (patch) | |
tree | 6476934272634893d7171e5bdafedde538a89175 | |
parent | 26d57f96410d474dff2e57b31cdd47764ff7b05b (diff) | |
download | gitlab-ce-jv-catfile-limit-test-only.tar.gz |
Only use size 5 in testjv-catfile-limit-test-only
-rw-r--r-- | lib/gitlab/setup_helper.rb | 8 |
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 |