diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-05 13:20:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-05 13:20:03 +0300 |
| commit | d2612b42b9da6638d70b9d7144f6d427070d042d (patch) | |
| tree | ed7de87d4b112cae8a45ba186d717ca9768c7d4e /doc/administration/gitaly | |
| parent | d80373b353005e70f44eca8a3bc4a4c5cfbf0e9e (diff) | |
Add latest changes from gitlab-org/gitlab@15-1-stable-ee
Diffstat (limited to 'doc/administration/gitaly')
| -rw-r--r-- | doc/administration/gitaly/configure_gitaly.md | 8 | ||||
| -rw-r--r-- | doc/administration/gitaly/monitoring.md | 4 |
2 files changed, 5 insertions, 7 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`. diff --git a/doc/administration/gitaly/monitoring.md b/doc/administration/gitaly/monitoring.md index a0a2e43569c..ac0c4cf139d 100644 --- a/doc/administration/gitaly/monitoring.md +++ b/doc/administration/gitaly/monitoring.md @@ -48,8 +48,8 @@ the Gitaly logs and Prometheus: You can observe the status of [control groups (cgroups)](configure_gitaly.md#control-groups) using Prometheus: -- `gitaly_cgroups_memory_failed_total`, a gauge for the total number of times - the memory limit has been hit. This number resets each time a server is +- `gitaly_cgroups_reclaim_attempts_total`, a gauge for the total number of times + there has been a memory relcaim attempt. This number resets each time a server is restarted. - `gitaly_cgroups_cpu_usage`, a gauge that measures CPU usage per cgroup. - `gitaly_cgroup_procs_total`, a gauge that measures the total number of |