summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2018-03-22 16:49:13 -0700
committerDJ Mountney <david@twkie.net>2018-03-22 17:21:10 -0700
commitf4218f277adf59a76da43ca534037feff024614d (patch)
tree486c74201102a32b5e7840514d82fbc9641250f7
parentbe0ce05c5d07b0b27be243f0a3d57b662dcab1af (diff)
downloadgitlab-ce-f4218f277adf59a76da43ca534037feff024614d.tar.gz
Increase the memory limits used in the unicorn killerincrease-unicorn-memory-killer-limits
These limits were updated in our docs, and in omnibus some time ago. But the defaults in the source-install were missed.
-rw-r--r--changelogs/unreleased/increase-unicorn-memory-killer-limits.yml5
-rw-r--r--config.ru4
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