Commit 06f41f75 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'gy-update-RA-sidekiq-guidance-docs' into 'master'

Update Sidekiq Cluster process guidance in RA docs

See merge request gitlab-org/gitlab!59471
parents 26be8f2c c782dc88
...@@ -1917,7 +1917,12 @@ To configure the Sidekiq nodes, on each one: ...@@ -1917,7 +1917,12 @@ To configure the Sidekiq nodes, on each one:
### Sidekiq configuration ### ### Sidekiq configuration ###
####################################### #######################################
sidekiq['listen_address'] = "0.0.0.0" sidekiq['listen_address'] = "0.0.0.0"
sidekiq['cluster'] = true # no need to set this after GitLab 13.0
# Set number of Sidekiq queue processes to the same number as available CPUs
sidekiq['queue_groups'] = ['*'] * 4
# Set number of Sidekiq threads per queue process to the recommend number of 10
sidekiq['max_concurrency'] = 10
####################################### #######################################
### Monitoring configuration ### ### Monitoring configuration ###
...@@ -1962,7 +1967,9 @@ To configure the Sidekiq nodes, on each one: ...@@ -1962,7 +1967,9 @@ To configure the Sidekiq nodes, on each one:
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
NOTE: NOTE:
You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md). If you find that the environment's Sidekiq job processing is slow with long queues,
more nodes can be added as required. You can also tune your Sidekiq nodes to
run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md).
<div align="right"> <div align="right">
<a type="button" class="btn btn-default" href="#setup-components"> <a type="button" class="btn btn-default" href="#setup-components">
......
...@@ -1919,7 +1919,12 @@ To configure the Sidekiq nodes, on each one: ...@@ -1919,7 +1919,12 @@ To configure the Sidekiq nodes, on each one:
### Sidekiq configuration ### ### Sidekiq configuration ###
####################################### #######################################
sidekiq['listen_address'] = "0.0.0.0" sidekiq['listen_address'] = "0.0.0.0"
sidekiq['cluster'] = true # no need to set this after GitLab 13.0
# Set number of Sidekiq queue processes to the same number as available CPUs
sidekiq['queue_groups'] = ['*'] * 4
# Set number of Sidekiq threads per queue process to the recommend number of 10
sidekiq['max_concurrency'] = 10
####################################### #######################################
### Monitoring configuration ### ### Monitoring configuration ###
...@@ -1964,7 +1969,9 @@ To configure the Sidekiq nodes, on each one: ...@@ -1964,7 +1969,9 @@ To configure the Sidekiq nodes, on each one:
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
NOTE: NOTE:
You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md). If you find that the environment's Sidekiq job processing is slow with long queues,
more nodes can be added as required. You can also tune your Sidekiq nodes to
run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md).
<div align="right"> <div align="right">
<a type="button" class="btn btn-default" href="#setup-components"> <a type="button" class="btn btn-default" href="#setup-components">
......
...@@ -648,6 +648,8 @@ On each node perform the following: ...@@ -648,6 +648,8 @@ On each node perform the following:
node_exporter['listen_address'] = '0.0.0.0:9100' node_exporter['listen_address'] = '0.0.0.0:9100'
gitlab_workhorse['prometheus_listen_addr'] = '0.0.0.0:9229' gitlab_workhorse['prometheus_listen_addr'] = '0.0.0.0:9229'
sidekiq['listen_address'] = "0.0.0.0" sidekiq['listen_address'] = "0.0.0.0"
# Set number of Sidekiq threads per queue process to the recommend number of 10
sidekiq['max_concurrency'] = 10
puma['listen'] = '0.0.0.0' puma['listen'] = '0.0.0.0'
# Add the monitoring node's IP address to the monitoring whitelist and allow it to # Add the monitoring node's IP address to the monitoring whitelist and allow it to
......
...@@ -1602,6 +1602,12 @@ To configure the Sidekiq nodes, one each one: ...@@ -1602,6 +1602,12 @@ To configure the Sidekiq nodes, one each one:
####################################### #######################################
sidekiq['listen_address'] = "0.0.0.0" sidekiq['listen_address'] = "0.0.0.0"
# Set number of Sidekiq queue processes to the same number as available CPUs
sidekiq['queue_groups'] = ['*'] * 2
# Set number of Sidekiq threads per queue process to the recommend number of 10
sidekiq['max_concurrency'] = 10
####################################### #######################################
### Monitoring configuration ### ### Monitoring configuration ###
####################################### #######################################
...@@ -1657,7 +1663,9 @@ To configure the Sidekiq nodes, one each one: ...@@ -1657,7 +1663,9 @@ To configure the Sidekiq nodes, one each one:
``` ```
NOTE: NOTE:
You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md). If you find that the environment's Sidekiq job processing is slow with long queues,
more nodes can be added as required. You can also tune your Sidekiq nodes to
run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md).
<div align="right"> <div align="right">
<a type="button" class="btn btn-default" href="#setup-components"> <a type="button" class="btn btn-default" href="#setup-components">
......
...@@ -1926,7 +1926,12 @@ To configure the Sidekiq nodes, on each one: ...@@ -1926,7 +1926,12 @@ To configure the Sidekiq nodes, on each one:
### Sidekiq configuration ### ### Sidekiq configuration ###
####################################### #######################################
sidekiq['listen_address'] = "0.0.0.0" sidekiq['listen_address'] = "0.0.0.0"
sidekiq['cluster'] = true # no need to set this after GitLab 13.0
# Set number of Sidekiq queue processes to the same number as available CPUs
sidekiq['queue_groups'] = ['*'] * 4
# Set number of Sidekiq threads per queue process to the recommend number of 10
sidekiq['max_concurrency'] = 10
####################################### #######################################
### Monitoring configuration ### ### Monitoring configuration ###
...@@ -1971,7 +1976,9 @@ To configure the Sidekiq nodes, on each one: ...@@ -1971,7 +1976,9 @@ To configure the Sidekiq nodes, on each one:
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
NOTE: NOTE:
You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md). If you find that the environment's Sidekiq job processing is slow with long queues,
more nodes can be added as required. You can also tune your Sidekiq nodes to
run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md).
<div align="right"> <div align="right">
<a type="button" class="btn btn-default" href="#setup-components"> <a type="button" class="btn btn-default" href="#setup-components">
......
...@@ -1591,6 +1591,12 @@ To configure the Sidekiq nodes, one each one: ...@@ -1591,6 +1591,12 @@ To configure the Sidekiq nodes, one each one:
####################################### #######################################
sidekiq['listen_address'] = "0.0.0.0" sidekiq['listen_address'] = "0.0.0.0"
# Set number of Sidekiq queue processes to the same number as available CPUs
sidekiq['queue_groups'] = ['*'] * 4
# Set number of Sidekiq threads per queue process to the recommend number of 10
sidekiq['max_concurrency'] = 10
####################################### #######################################
### Monitoring configuration ### ### Monitoring configuration ###
####################################### #######################################
...@@ -1645,7 +1651,9 @@ To configure the Sidekiq nodes, one each one: ...@@ -1645,7 +1651,9 @@ To configure the Sidekiq nodes, one each one:
``` ```
NOTE: NOTE:
You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md). If you find that the environment's Sidekiq job processing is slow with long queues,
more nodes can be added as required. You can also tune your Sidekiq nodes to
run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md).
<div align="right"> <div align="right">
<a type="button" class="btn btn-default" href="#setup-components"> <a type="button" class="btn btn-default" href="#setup-components">
......
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