kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Increase the memory limits used in the unicorn killer

Browse source 
These limits were updated in our docs, and in omnibus some time ago. But
the defaults in the source-install were missed.
This commit is contained in:
DJ Mountney 2018-03-22 16:49:13 -07:00
parent be0ce05c5d
commit f4218f277a
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/increase-unicorn-memory-killer-limits.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Increase the memory limits used in the unicorn killer
merge_request: 17948
author:
type: other

4
config.ru
View file

@ -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