Commit 28be0478 authored by Douwe Maan's avatar Douwe Maan

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
parents 453b5c1c f4218f27
Pipeline #19367817 passed with stages
in 30 minutes and 38 seconds
---
title: Increase the memory limits used in the unicorn killer
merge_request: 17948
author:
type: other
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment