diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-12-08 13:30:20 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-12-08 13:30:20 +0000 |
| commit | acf1844897405849f836fefc96284dd7a8416879 (patch) | |
| tree | e3989096277d0dd488338ac3c3c26bafe8418958 | |
| parent | 7d662114b301ff507767778ad509ebf552b2b8e2 (diff) | |
| parent | f811b695f8c9d7019b5e9f33aae962163e8c0020 (diff) | |
| download | gitlab-ce-acf1844897405849f836fefc96284dd7a8416879.tar.gz | |
Merge branch 'unicorn-advice' into 'master'
Unicorn advice
See merge request !1314
| -rw-r--r-- | config/unicorn.rb.example | 14 | ||||
| -rw-r--r-- | doc/install/requirements.md | 12 |
2 files changed, 18 insertions, 8 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index ea22744fd90..d8b4f5c7c32 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -13,9 +13,9 @@ # # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" -# Use at least one worker per core if you're on a dedicated server, -# more will usually help for _short_ waits on databases/caches. -# The minimum is 2 +# Read about unicorn workers here: +# http://doc.gitlab.com/ee/install/requirements.html#unicorn-workers +# worker_processes 2 # Since Unicorn is never exposed to outside clients, it does not need to @@ -37,10 +37,10 @@ listen "127.0.0.1:8080", :tcp_nopush => true # nuke workers after 30 seconds instead of 60 seconds (the default) # -# NOTICE: git push over http depends on this value. -# If you want be able to push huge amount of data to git repository over http -# you will have to increase this value too. -# +# NOTICE: git push over http depends on this value. +# If you want be able to push huge amount of data to git repository over http +# you will have to increase this value too. +# # Example of output if you try to push 1GB repo to GitLab over http. # -> git push http://gitlab.... master # diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 660c1adb802..28e1fa34d23 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -88,10 +88,20 @@ Sidekiq processes the background jobs with a multithreaded process. This process starts with the entire Rails stack (200MB+) but it can grow over time due to memory leaks. On a very active server (10,000 active users) the Sidekiq process can use 1GB+ of memory. +## Unicorn Workers + +It's possible to increase the amount of unicorn workers. +This will usually help for short waits on databases and caches. + +For most instances we recommend using CPU cores + 1 unicorn workers. +For a machine with 2 cores, 3 unicorn workers is ideal. + +For memory constrained instances, we recommend using a single unicorn worker. + ## Supported web browsers - Chrome (Latest stable version) -- Firefox (Latest released version and [latest ESR version](https://www.mozilla.org/en-US/firefox/organizations/)) +- Firefox (Latest released version and [latest ESR version](https://www.mozilla.org/en-US/firefox/organizations/)) - Safari 7+ (known problem: required fields in html5 do not work) - Opera (Latest released version) - IE 10+ |