BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit f4218f27 by DJ Mountney
Options

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.
parent be0ce05c
Showing with 7 additions and 2 deletions
changelogs/unreleased/increase-unicorn-memory-killer-limits.yml 0 → 100644
---
title: Increase the memory limits used in the unicorn killer
merge_request: 17948
author:
type: other
config.ru
...@@ -7,8 +7,8 @@ if defined?(Unicorn) ...@@ -7,8 +7,8 @@ if defined?(Unicorn)
# Unicorn self-process killer # Unicorn self-process killer
require 'unicorn/worker_killer' require 'unicorn/worker_killer'
min = (ENV['GITLAB_UNICORN_MEMORY_MIN'] || 300 * 1 << 20).to_i min = (ENV['GITLAB_UNICORN_MEMORY_MIN'] || 400 * 1 << 20).to_i
max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 350 * 1 << 20).to_i max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 650 * 1 << 20).to_i
# Max memory size (RSS) per worker # Max memory size (RSS) per worker
use Unicorn::WorkerKiller::Oom, min, max 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