diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 15:08:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 15:08:49 +0300 |
| commit | 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 (patch) | |
| tree | 614a93d9bf8df34ecfc25c02648329987fb21dde /doc/administration/operations | |
| parent | f0707f413ce49b5712fca236b950acbec029be1e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/operations')
| -rw-r--r-- | doc/administration/operations/unicorn.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/administration/operations/unicorn.md b/doc/administration/operations/unicorn.md index 653fad7e24f..edd580d10c7 100644 --- a/doc/administration/operations/unicorn.md +++ b/doc/administration/operations/unicorn.md @@ -65,10 +65,13 @@ maximum memory threshold (in bytes) for the Unicorn worker killer by setting the following values `/etc/gitlab/gitlab.rb`: ```ruby -unicorn['worker_memory_limit_min'] = "400 * 1 << 20" -unicorn['worker_memory_limit_max'] = "650 * 1 << 20" +unicorn['worker_memory_limit_min'] = "1024 * 1 << 20" +unicorn['worker_memory_limit_max'] = "1280 * 1 << 20" ``` +NOTE: **Note:** +These values apply to GitLab 12.7.0 or newer versions. For older GitLab versions please consult [previous worker memory limits](https://gitlab.com/gitlab-org/omnibus-gitlab/-/blob/12.6.0+ee.0/files/gitlab-cookbooks/gitlab/attributes/default.rb#L422-423). + Otherwise, you can set the `GITLAB_UNICORN_MEMORY_MIN` and `GITLAB_UNICORN_MEMORY_MAX` [environment variables](../environment_variables.md). |