Skip to content

Commit 6881a23

Browse files
ereadGitLab
andcommitted
Merge branch 'eakca_deprecated_configs_for_memory_constrained_envs' into 'master'
Update memory constrained environments docs with changes in v16 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7130 Merged-by: Evan Read <[email protected]> Approved-by: Sami Hiltunen <[email protected]> Approved-by: Evan Read <[email protected]> Reviewed-by: Sami Hiltunen <[email protected]> Co-authored-by: GitLab <[email protected]>
2 parents c912cc5 + 9a8777e commit 6881a23

File tree

1 file changed

+40
-31
lines changed

1 file changed

+40
-31
lines changed

doc/settings/memory_constrained_envs.md

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -159,22 +159,26 @@ It is advised to configure a maximum concurrency and memory limits enforced by G
159159
In `/etc/gitlab/gitlab.rb`:
160160

161161
```ruby
162-
gitaly['ruby_max_rss'] = 200_000_000
163-
gitaly['concurrency'] = [
164-
{
165-
'rpc' => "/gitaly.SmartHTTPService/PostReceivePack",
166-
'max_per_repo' => 3
167-
}, {
168-
'rpc' => "/gitaly.SSHService/SSHUploadPack",
169-
'max_per_repo' => 3
170-
}
171-
]
172-
173-
gitaly['cgroups_repositories_count'] = 2
174-
gitaly['cgroups_mountpoint'] = '/sys/fs/cgroup'
175-
gitaly['cgroups_hierarchy_root'] = 'gitaly'
176-
gitaly['cgroups_memory_bytes'] = 500000
177-
gitaly['cgroups_cpu_shares'] = 512
162+
gitaly['configuration'] = {
163+
concurrency: [
164+
{
165+
'rpc' => "/gitaly.SmartHTTPService/PostReceivePack",
166+
'max_per_repo' => 3,
167+
}, {
168+
'rpc' => "/gitaly.SSHService/SSHUploadPack",
169+
'max_per_repo' => 3,
170+
},
171+
],
172+
cgroups: {
173+
repositories: {
174+
count: 2,
175+
},
176+
mountpoint: '/sys/fs/cgroup',
177+
hierarchy_root: 'gitaly',
178+
memory_bytes: 500000,
179+
cpu_shares: 512,
180+
},
181+
}
178182

179183
gitaly['env'] = {
180184
'GITALY_COMMAND_SPAWN_MAX_PARALLEL' => '2'
@@ -250,21 +254,26 @@ and disable the Prometheus Metrics feature:
250254
'MALLOC_CONF' => 'dirty_decay_ms:1000,muzzy_decay_ms:1000'
251255
}
252256

253-
gitaly['cgroups_repositories_count'] = 2
254-
gitaly['cgroups_mountpoint'] = '/sys/fs/cgroup'
255-
gitaly['cgroups_hierarchy_root'] = 'gitaly'
256-
gitaly['cgroups_memory_bytes'] = 500000
257-
gitaly['cgroups_cpu_shares'] = 512
258-
259-
gitaly['concurrency'] = [
260-
{
261-
'rpc' => "/gitaly.SmartHTTPService/PostReceivePack",
262-
'max_per_repo' => 3
263-
}, {
264-
'rpc' => "/gitaly.SSHService/SSHUploadPack",
265-
'max_per_repo' => 3
266-
}
267-
]
257+
gitaly['configuration'] = {
258+
concurrency: [
259+
{
260+
'rpc' => "/gitaly.SmartHTTPService/PostReceivePack",
261+
'max_per_repo' => 3,
262+
}, {
263+
'rpc' => "/gitaly.SSHService/SSHUploadPack",
264+
'max_per_repo' => 3,
265+
},
266+
],
267+
cgroups: {
268+
repositories: {
269+
count: 2,
270+
},
271+
mountpoint: '/sys/fs/cgroup',
272+
hierarchy_root: 'gitaly',
273+
memory_bytes: 500000,
274+
cpu_shares: 512,
275+
},
276+
}
268277
gitaly['env'] = {
269278
'MALLOC_CONF' => 'dirty_decay_ms:1000,muzzy_decay_ms:1000',
270279
'GITALY_COMMAND_SPAWN_MAX_PARALLEL' => '2'

0 commit comments

Comments
 (0)