gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'increase-unicorn-limits' into 'master' 

Increase Unicorn memory limits to 300-350

cc @marin

See merge request !609
This commit is contained in:
Marin Jankovski 2016-01-21 11:24:32 +00:00
parent 796a0d9875 a9d0b7a8fa
commit 814ee578bb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/gitlab-config-template/gitlab.rb.template
View File

@ -355,8 +355,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)"
##################

6
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -244,7 +244,7 @@ default['gitlab']['unicorn']['worker_processes'] = [
node['cpu']['total'].to_i + 1,
# See how many 300MB worker processes fit in (total RAM - 1GB). We add
# 128000 KB in the numerator to get rounding instead of integer truncation.
(node['memory']['total'].to_i - 1048576 + 128000) / 314000
(node['memory']['total'].to_i - 1048576 + 128000) / 358400
].min # min because we want to exceed neither CPU nor RAM
].max # max because we need at least 2 workers
default['gitlab']['unicorn']['listen'] = '127.0.0.1'
@ -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