diff --git a/doc/settings/memory_constrained_envs.md b/doc/settings/memory_constrained_envs.md index ec22d92a4543a71061fc50320d6db6c21c23d06c_ZG9jL3NldHRpbmdzL21lbW9yeV9jb25zdHJhaW5lZF9lbnZzLm1k..497c8da40121ef27d1adf9b7746c892b5287814a_ZG9jL3NldHRpbmdzL21lbW9yeV9jb25zdHJhaW5lZF9lbnZzLm1k 100644 --- a/doc/settings/memory_constrained_envs.md +++ b/doc/settings/memory_constrained_envs.md @@ -159,22 +159,26 @@ In `/etc/gitlab/gitlab.rb`: ```ruby -gitaly['ruby_max_rss'] = 200_000_000 -gitaly['concurrency'] = [ - { - 'rpc' => "/gitaly.SmartHTTPService/PostReceivePack", - 'max_per_repo' => 3 - }, { - 'rpc' => "/gitaly.SSHService/SSHUploadPack", - 'max_per_repo' => 3 - } -] - -gitaly['cgroups_repositories_count'] = 2 -gitaly['cgroups_mountpoint'] = '/sys/fs/cgroup' -gitaly['cgroups_hierarchy_root'] = 'gitaly' -gitaly['cgroups_memory_bytes'] = 500000 -gitaly['cgroups_cpu_shares'] = 512 +gitaly['configuration'] = { + concurrency: [ + { + 'rpc' => "/gitaly.SmartHTTPService/PostReceivePack", + 'max_per_repo' => 3, + }, { + 'rpc' => "/gitaly.SSHService/SSHUploadPack", + 'max_per_repo' => 3, + }, + ], + cgroups: { + repositories: { + count: 2, + }, + mountpoint: '/sys/fs/cgroup', + hierarchy_root: 'gitaly', + memory_bytes: 500000, + cpu_shares: 512, + }, +} gitaly['env'] = { 'GITALY_COMMAND_SPAWN_MAX_PARALLEL' => '2' @@ -250,21 +254,26 @@ 'MALLOC_CONF' => 'dirty_decay_ms:1000,muzzy_decay_ms:1000' } - gitaly['cgroups_repositories_count'] = 2 - gitaly['cgroups_mountpoint'] = '/sys/fs/cgroup' - gitaly['cgroups_hierarchy_root'] = 'gitaly' - gitaly['cgroups_memory_bytes'] = 500000 - gitaly['cgroups_cpu_shares'] = 512 - - gitaly['concurrency'] = [ - { - 'rpc' => "/gitaly.SmartHTTPService/PostReceivePack", - 'max_per_repo' => 3 - }, { - 'rpc' => "/gitaly.SSHService/SSHUploadPack", - 'max_per_repo' => 3 - } - ] + gitaly['configuration'] = { + concurrency: [ + { + 'rpc' => "/gitaly.SmartHTTPService/PostReceivePack", + 'max_per_repo' => 3, + }, { + 'rpc' => "/gitaly.SSHService/SSHUploadPack", + 'max_per_repo' => 3, + }, + ], + cgroups: { + repositories: { + count: 2, + }, + mountpoint: '/sys/fs/cgroup', + hierarchy_root: 'gitaly', + memory_bytes: 500000, + cpu_shares: 512, + }, + } gitaly['env'] = { 'MALLOC_CONF' => 'dirty_decay_ms:1000,muzzy_decay_ms:1000', 'GITALY_COMMAND_SPAWN_MAX_PARALLEL' => '2'