diff --git a/doc/administration/gitaly/configure_gitaly.md b/doc/administration/gitaly/configure_gitaly.md index b1309e3b204e9d8bac220f58c5295f1a691fc634..fd6ffedad99666cd0648c0b672728bf0945d2a54 100644 --- a/doc/administration/gitaly/configure_gitaly.md +++ b/doc/administration/gitaly/configure_gitaly.md @@ -610,14 +610,14 @@ When a repository cgroup reaches its: NOTE: When these limits are reached, performance may be reduced and users may be disconnected. -### Configure repository cgroups (new method) +### Configure repository cgroups > - This method of configuring repository cgroups was introduced in GitLab 15.1. > - `cpu_quota_us`[introduced](https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5422) in GitLab 15.10. > - `max_cgroups_per_repo` [introduced](https://gitlab.com/gitlab-org/gitaly/-/issues/5689) in GitLab 16.7. +> - Documentation for the legacy method was [removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/176694) in GitLab 17.8. -To configure repository cgroups in Gitaly using the new method, use the following settings for the new configuration method -to `gitaly['configuration'][:cgroups]` in `/etc/gitlab/gitlab.rb`: +To configure repository cgroups in Gitaly, use the following settings for `gitaly['configuration'][:cgroups]` in `/etc/gitlab/gitlab.rb`: - `mountpoint` is where the parent cgroup directory is mounted. Defaults to `/sys/fs/cgroup`. - `hierarchy_root` is the parent cgroup under which Gitaly creates groups, and @@ -676,42 +676,9 @@ gitaly['configuration'] = { } ``` -### Configure repository cgroups (legacy method) - -To configure repository cgroups in Gitaly using the legacy method, use the following settings -in `/etc/gitlab/gitlab.rb`: - -- `cgroups_count` is the number of cgroups created. Each time a new - command is spawned, Gitaly assigns it to one of these cgroups based - on the command line arguments of the command. A circular hashing algorithm assigns - commands to these cgroups. -- `cgroups_mountpoint` is where the parent cgroup directory is mounted. Defaults to `/sys/fs/cgroup`. -- `cgroups_hierarchy_root` is the parent cgroup under which Gitaly creates groups, and - is expected to be owned by the user and group Gitaly runs as. A Linux package installation - creates the set of directories `mountpoint//hierarchy_root` - when Gitaly starts. -- `cgroups_memory_enabled` enables or disables the memory limit on cgroups. -- `cgroups_memory_bytes` is the total memory limit each cgroup imposes on the processes added to it. -- `cgroups_cpu_enabled` enables or disables the CPU limit on cgroups. -- `cgroups_cpu_shares` is the CPU limit each cgroup imposes on the processes added to it. The maximum is 1024 shares, - which represents 100% of CPU. - -For example: - -```ruby -# in /etc/gitlab/gitlab.rb -gitaly['cgroups_count'] = 1000 -gitaly['cgroups_mountpoint'] = "/sys/fs/cgroup" -gitaly['cgroups_hierarchy_root'] = "gitaly" -gitaly['cgroups_memory_limit'] = 32212254720 -gitaly['cgroups_memory_enabled'] = true -gitaly['cgroups_cpu_shares'] = 1024 -gitaly['cgroups_cpu_enabled'] = true -``` - ### Configuring oversubscription -In the previous example using the new configuration method: +In the previous example: - The top level memory limit is capped at 60 GB. - Each of the 1000 cgroups in the repositories pool is capped at 20 GB.