Commit bbc01db9 authored by Joshua Lambert's avatar Joshua Lambert

Minor improvements to Puma docs

parent e018b6c8
...@@ -10,7 +10,8 @@ Unicorn unless explicitly specified not to. ...@@ -10,7 +10,8 @@ Unicorn unless explicitly specified not to.
## Why switch to Puma? ## Why switch to Puma?
Puma has a multi-thread architecture which uses less memory than a multi-process Puma has a multi-thread architecture which uses less memory than a multi-process
application server like Unicorn. application server like Unicorn. On GitLab.com, we saw a 40% reduction in memory
consumption.
Most Rails applications requests normally include a proportion of I/O wait time. Most Rails applications requests normally include a proportion of I/O wait time.
During I/O wait time MRI Ruby will release the GVL (Global VM Lock) to other threads. During I/O wait time MRI Ruby will release the GVL (Global VM Lock) to other threads.
...@@ -18,9 +19,14 @@ Multi-threaded Puma can therefore still serve more requests than a single proces ...@@ -18,9 +19,14 @@ Multi-threaded Puma can therefore still serve more requests than a single proces
## Configuring Puma to replace Unicorn ## Configuring Puma to replace Unicorn
If you are currently running Unicorn and would like to switch to Puma, server configuration Beginning with GitLab 13.0, Puma is the default application server. We plan to remove support for
will _not_ carry over automatically. For details on matching Unicorn configuration settings with Unicorn in GitLab 14.0.
the Puma equivalent, where applicable, see [Converting Unicorn settings to Puma](https://docs.gitlab.com/omnibus/settings/puma.html#converting-unicorn-settings-to-puma).
When switching to Puma, Unicorn server configuration
will _not_ carry over automatically, due to differences between the two application servers.
For Omnibus-based deployments, see [Configuring Puma Settings](https://docs.gitlab.com/omnibus/settings/puma.html#configuring-puma-settings). For Helm
based deployments, see the [Webservice Chart documentation](https://docs.gitlab.com/charts/charts/gitlab/webservice/index.html).
## Performance caveat when using Puma with Rugged ## Performance caveat when using Puma with Rugged
......
...@@ -204,7 +204,7 @@ Omnibus GitLab defaults to the recommended Puma settings. Regardless of installa ...@@ -204,7 +204,7 @@ Omnibus GitLab defaults to the recommended Puma settings. Regardless of installa
tune the Puma settings. tune the Puma settings.
If you're using Omnibus GitLab, see [Puma settings](https://docs.gitlab.com/omnibus/settings/puma.html) If you're using Omnibus GitLab, see [Puma settings](https://docs.gitlab.com/omnibus/settings/puma.html)
for instructions on changing the Puma settings. for instructions on changing the Puma settings. If you are using the GitLab Helm chart, see the [Webservice chart](https://docs.gitlab.com/charts/charts/gitlab/webservice/index.html).
### Puma workers ### Puma workers
......
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