Commit f8ee4a19 authored by Yorick Peterse's avatar Yorick Peterse
Browse files

Increase Unicorn memory limits to 300-350 

See gitlab-org/gitlab-ce!2513 and gitlab-org/gitlab-ce!2421 for more
information.
parent 88c2a5ee

files/gitlab-config-template/gitlab.rb.template

+2 −2
Original line number Diff line number Diff line
@@ -354,8 +354,8 @@ external_url 'GENERATED_EXTERNAL_URL' 
## Only change these settings if you understand well what they mean

## see https://about.gitlab.com/2015/06/05/how-gitlab-uses-unicorn-and-unicorn-worker-killer/

## and https://github.com/kzk/unicorn-worker-killer

# unicorn['worker_memory_limit_min'] = "200*(1024**2)"

# unicorn['worker_memory_limit_max'] = "250*(1024**2)"

# unicorn['worker_memory_limit_min'] = "300*(1024**2)"

# unicorn['worker_memory_limit_max'] = "350*(1024**2)"





##################

files/gitlab-cookbooks/gitlab/attributes/default.rb

+2 −2
Original line number Diff line number Diff line
@@ -257,8 +257,8 @@ default['gitlab']['unicorn']['tcp_nopush'] = true 
default['gitlab']['unicorn']['backlog_socket'] = 1024

default['gitlab']['unicorn']['somaxconn'] = 1024

default['gitlab']['unicorn']['worker_timeout'] = 60

default['gitlab']['unicorn']['worker_memory_limit_min'] = "250*(1024**2)"

default['gitlab']['unicorn']['worker_memory_limit_max'] = "300*(1024**2)"

default['gitlab']['unicorn']['worker_memory_limit_min'] = "300*(1024**2)"

default['gitlab']['unicorn']['worker_memory_limit_max'] = "350*(1024**2)"



####

# Sidekiq