diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-23 08:55:18 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-23 08:55:18 +0000 |
| commit | 28be04784860b417c94311b2805f82c4789937a1 (patch) | |
| tree | a40b01f2b9bc7b0b139bc2e67991d58d72d13ba6 | |
| parent | 453b5c1c12ecc34f2aca7df021bfc451fefab095 (diff) | |
| parent | f4218f277adf59a76da43ca534037feff024614d (diff) | |
| download | gitlab-ce-28be04784860b417c94311b2805f82c4789937a1.tar.gz | |
Merge branch 'increase-unicorn-memory-killer-limits' into 'master'
Increase the memory limits used in the unicorn killer
Closes gitlab-com/infrastructure#19
See merge request gitlab-org/gitlab-ce!17948
| -rw-r--r-- | changelogs/unreleased/increase-unicorn-memory-killer-limits.yml | 5 | ||||
| -rw-r--r-- | config.ru | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/increase-unicorn-memory-killer-limits.yml b/changelogs/unreleased/increase-unicorn-memory-killer-limits.yml new file mode 100644 index 00000000000..6d7d2df4f4a --- /dev/null +++ b/changelogs/unreleased/increase-unicorn-memory-killer-limits.yml @@ -0,0 +1,5 @@ +--- +title: Increase the memory limits used in the unicorn killer +merge_request: 17948 +author: +type: other diff --git a/config.ru b/config.ru index 7b15939c6ff..405d01863ac 100644 --- a/config.ru +++ b/config.ru @@ -7,8 +7,8 @@ if defined?(Unicorn) # Unicorn self-process killer require 'unicorn/worker_killer' - min = (ENV['GITLAB_UNICORN_MEMORY_MIN'] || 300 * 1 << 20).to_i - max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 350 * 1 << 20).to_i + min = (ENV['GITLAB_UNICORN_MEMORY_MIN'] || 400 * 1 << 20).to_i + max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 650 * 1 << 20).to_i # Max memory size (RSS) per worker use Unicorn::WorkerKiller::Oom, min, max |