From 200a31b78446e969063647667d0e368fc72ca642 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Thu, 4 Feb 2016 07:30:24 -0800 Subject: [PATCH 1/3] Document that one unicorn worker is enough. --- doc/install/requirements.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 006dae8ca9a2..a21a6bdb7459 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -66,8 +66,8 @@ If you have enough RAM memory and a recent CPU the speed of GitLab is mainly lim You need at least 2GB of addressable memory (RAM + swap) to install and use GitLab! With less memory GitLab will give strange errors during the reconfigure run and 500 errors during usage. -- 512MB RAM + 1.5GB of swap is the absolute minimum but we strongly **advise against** this amount of memory. See the unicorn worker section below for more advise. -- 1GB RAM + 1GB swap supports up to 100 users but it will be slow +- 512MB RAM + 1GB of swap is the absolute minimum but we strongly **advise against** this amount of memory. See the unicorn worker section below for more advise. +- 1GB RAM + 1GB of swap supports up to 100 users but it will be slow - **2GB RAM** is the **recommended** memory size and supports up to 100 users - 4GB RAM supports up to 1,000 users - 8GB RAM supports up to 2,000 users @@ -87,9 +87,8 @@ For most instances we recommend using: CPU cores + 1 = unicorn workers. So for a machine with 2 cores, 3 unicorn workers is ideal. For all machines that have 1GB and up we recommend a minimum of three unicorn workers. -If you have a 512MB machine with a magnetic (non-SSD) swap drive we recommend to configure only one Unicorn worker to prevent excessive swapping. -With one Unicorn worker only git over ssh access will work because the git over HTTP access requires two running workers (one worker to receive the user request and one worker for the authorization check). -If you have a 512MB machine with a SSD drive you can use two Unicorn workers, this will allow HTTP access although it will be slow due to swapping. +If you have a 512MB machine we recommend to configure only one Unicorn worker to prevent excessive swapping. +Since GitLab 8.0 one Unicorn worker will still allow all functionality (git access over ssh and http) because of [GitLab Workhorse](https://gitlab.com/gitlab-org/gitlab-workhorse/). To change the Unicorn workers when you have the Omnibus package please see [the Unicorn settings in the Omnibus GitLab documentation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/unicorn.md#unicorn-settings). -- GitLab From 121f9f40e14fc02c3896a9a32b3755e0926d7e2a Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Thu, 4 Feb 2016 07:35:19 -0800 Subject: [PATCH 2/3] Link to operations documentation. --- doc/install/requirements.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/install/requirements.md b/doc/install/requirements.md index a21a6bdb7459..6be909692af5 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -92,6 +92,8 @@ Since GitLab 8.0 one Unicorn worker will still allow all functionality (git acce To change the Unicorn workers when you have the Omnibus package please see [the Unicorn settings in the Omnibus GitLab documentation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/unicorn.md#unicorn-settings). +For more background about the Unicorn workers please see [the unicorn section in the operations documentation](http://doc.gitlab.com/ce/operations/unicorn.html). + ## Database If you want to run the database separately expect a size of about 1 MB per user. -- GitLab From 97abcd21442bfa70cf41003f2c307d30c0f98cbf Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 8 Feb 2016 17:50:09 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Change=20suggested=20by=20R=C3=A9my?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/install/requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 6be909692af5..c7f0dcfcfd8d 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -88,7 +88,7 @@ So for a machine with 2 cores, 3 unicorn workers is ideal. For all machines that have 1GB and up we recommend a minimum of three unicorn workers. If you have a 512MB machine we recommend to configure only one Unicorn worker to prevent excessive swapping. -Since GitLab 8.0 one Unicorn worker will still allow all functionality (git access over ssh and http) because of [GitLab Workhorse](https://gitlab.com/gitlab-org/gitlab-workhorse/). +Since GitLab 8.0 one Unicorn worker will still allow all functionality (git access over ssh and http) thanks to [GitLab Workhorse](https://gitlab.com/gitlab-org/gitlab-workhorse/). To change the Unicorn workers when you have the Omnibus package please see [the Unicorn settings in the Omnibus GitLab documentation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/unicorn.md#unicorn-settings). -- GitLab