Commit 431f33fe authored by Stan Hu's avatar Stan Hu

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
parents e5aba4b1 2d444780
...@@ -43,7 +43,13 @@ module Gitlab ...@@ -43,7 +43,13 @@ module Gitlab
config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby
config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path } config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
config[:bin_dir] = Gitlab.config.gitaly.client_path config[:bin_dir] = Gitlab.config.gitaly.client_path
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 } config[:git] = { catfile_cache_size: 5 }
end
TomlRB.dump(config) TomlRB.dump(config)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment