diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 35251f9fa971cc66e9befb502d7761845f276414_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..14b0998662b2344a482c92881feeca1ff5bd1170_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -2666,6 +2666,7 @@ # memory_bytes: 12884901888, # cpu_shares: 128, # cpu_quota_us: 200000 +# max_cgroups_per_repo: 2 # }, # }, # concurrency: [ diff --git a/spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb b/spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb index 35251f9fa971cc66e9befb502d7761845f276414_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRhbHkvcmVjaXBlcy9naXRhbHlfc3BlYy5yYg==..14b0998662b2344a482c92881feeca1ff5bd1170_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRhbHkvcmVjaXBlcy9naXRhbHlfc3BlYy5yYg== 100644 --- a/spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb +++ b/spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb @@ -61,6 +61,7 @@ let(:cgroups_repositories_memory_bytes) { 1048576 } let(:cgroups_repositories_cpu_shares) { 128 } let(:cgroups_repositories_cpu_quota_us) { 200000 } + let(:cgroups_repositories_max_cgroups_per_repo) { 2 } let(:pack_objects_cache_enabled) { true } let(:pack_objects_cache_dir) { '/pack-objects-cache' } let(:pack_objects_cache_max_age) { '10m' } @@ -223,6 +224,7 @@ memory_bytes: cgroups_repositories_memory_bytes, cpu_shares: cgroups_repositories_cpu_shares, cpu_quota_us: cgroups_repositories_cpu_quota_us, + max_cgroups_per_repo: cgroups_repositories_max_cgroups_per_repo, } }, }, @@ -243,6 +245,7 @@ %r{memory_bytes = #{cgroups_repositories_memory_bytes}}, %r{cpu_shares = #{cgroups_repositories_cpu_shares}}, %r{cpu_quota_us = #{cgroups_repositories_cpu_quota_us}}, + %r{max_cgroups_per_repo = #{cgroups_repositories_max_cgroups_per_repo}}, ].map(&:to_s).join('\s+')) expect(chef_run).to render_file(config_path).with_content { |content|