diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-22 00:08:23 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-22 00:08:23 +0000 |
commit | bd9b2731b4ea44168d67a6b38df4e6f0475cd90e (patch) | |
tree | da397a913ff14c6d68e5fb8b27724b5f1eff6658 /doc/administration/gitaly/configure_gitaly.md | |
parent | c097ca59a16661859dc192ca1c02c957c3025d46 (diff) | |
download | gitlab-ce-bd9b2731b4ea44168d67a6b38df4e6f0475cd90e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/gitaly/configure_gitaly.md')
-rw-r--r-- | doc/administration/gitaly/configure_gitaly.md | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/doc/administration/gitaly/configure_gitaly.md b/doc/administration/gitaly/configure_gitaly.md index 26aa750900b..426d07b154d 100644 --- a/doc/administration/gitaly/configure_gitaly.md +++ b/doc/administration/gitaly/configure_gitaly.md @@ -825,7 +825,9 @@ information, see the [relevant documentation](monitoring.md#monitor-gitaly-concu ## Control groups -> Introduced in GitLab 13.10. +FLAG: +On self-managed GitLab, by default cgroups are not available. To make it available, ask an administrator to +[enable the feature flag](../feature_flags.md) named `gitaly_run_cmds_in_cgroup`. Gitaly shells out to Git for many of its operations. Git can consume a lot of resources for certain operations, especially for large repositories. @@ -862,10 +864,6 @@ Two ways of configuring cgroups are available. > This method of configuring cgroups introduced in GitLab 15.1. -FLAG: -On self-managed GitLab, by default this method of configuring cgroups is not available. To make it available, ask an administrator to -[enable the feature flag](../feature_flags.md) named `gitaly_run_cmds_in_cgroup`. - Gitaly creates a pool of cgroups that are isolated based on the repository used in the Git command to be placed under one of these cgroups. To configure cgroups in Gitaly, add `gitaly['cgroups']` to `/etc/gitlab/gitlab.rb`. |