From f4218f277adf59a76da43ca534037feff024614d Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Thu, 22 Mar 2018 16:49:13 -0700
Subject: [PATCH] Increase the memory limits used in the unicorn killer
These limits were updated in our docs, and in omnibus some time ago. But
the defaults in the source-install were missed.
---
.../unreleased/increase-unicorn-memory-killer-limits.yml | 5 +++++
config.ru | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
create mode 100644 changelogs/unreleased/increase-unicorn-memory-killer-limits.yml
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 000000000000..6d7d2df4f4a2
--- /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 7b15939c6ff9..405d01863ac4 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
--
GitLab