diff options
| author | Ben Kochie <bjk@gitlab.com> | 2017-09-25 16:00:45 +0200 |
|---|---|---|
| committer | Ben Kochie <bjk@gitlab.com> | 2017-09-25 16:00:45 +0200 |
| commit | 51f9d06eb0aa4b3a1d9d2e3ec0b991626d0096fd (patch) | |
| tree | f159b0b465c90fe54c365db8a2ccb6ee7dc5f9c5 | |
| parent | 8b1a3d40e76093ff6ffd28a6e08280f4b29afc8e (diff) | |
| download | gitlab-ce-bjk/memory_limit.tar.gz | |
Update the default memory limitsbjk/memory_limit
Update the memory limit to match needs, and be more in-line with Omnibus
default (450MB).
We should probably push these limits to omnibus as well.
Closes: https://gitlab.com/gitlab-org/gitlab-ce/issues/37437
| -rw-r--r-- | config.ru | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config.ru b/config.ru index 065ce59932f..1e4e0f99a6d 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'] || 500 * 1 << 20).to_i + max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 750 * 1 << 20).to_i # Max memory size (RSS) per worker use Unicorn::WorkerKiller::Oom, min, max |