Merge branch 'mg-remove-min-max-concurrency' into 'master'
Remove deprecated min_concurrency and max_concurrency for Sidekiq See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7549 Merged-by: Robert Marshall <rmarshall@gitlab.com> Approved-by: Dustin Collins <714871-dustinmm80@users.noreply.gitlab.com> Approved-by: Robert Marshall <rmarshall@gitlab.com> Reviewed-by: Jason Plum <jplum@gitlab.com> Co-authored-by: Ryan Egesdahl <regesdahl@gitlab.com> Co-authored-by: Gregorius Marco <gmarco@gitlab.com>
This commit is contained in:
commit
d94cbec689
|
@ -145,14 +145,14 @@ We observed 100-400MB of memory usage reduction configuring Puma this way.
|
|||
## Optimize Sidekiq
|
||||
|
||||
Sidekiq is a background processing daemon. When configured with GitLab by default
|
||||
it runs with a high concurrency mode of `50`. This does impact how much memory it can
|
||||
it runs with a concurrency mode of `20`. This does impact how much memory it can
|
||||
allocate at a given time. It is advised to configure it to use a significantly
|
||||
smaller value of `5` or `10` (preferred).
|
||||
|
||||
In `/etc/gitlab/gitlab.rb`:
|
||||
|
||||
```ruby
|
||||
sidekiq['max_concurrency'] = 10
|
||||
sidekiq['concurrency'] = 10
|
||||
```
|
||||
|
||||
## Optimize Gitaly
|
||||
|
@ -249,7 +249,7 @@ and disable the Prometheus Metrics feature:
|
|||
```ruby
|
||||
puma['worker_processes'] = 0
|
||||
|
||||
sidekiq['max_concurrency'] = 10
|
||||
sidekiq['concurrency'] = 10
|
||||
|
||||
prometheus_monitoring['enable'] = false
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ some running processes:
|
|||
```ruby
|
||||
# Reduce the number of running workers to the minimum in order to reduce memory usage
|
||||
puma['worker_processes'] = 2
|
||||
sidekiq['max_concurrency'] = 9
|
||||
sidekiq['concurrency'] = 9
|
||||
# Turn off monitoring to reduce idle cpu and disk usage
|
||||
prometheus_monitoring['enable'] = false
|
||||
```
|
||||
|
|
|
@ -1280,9 +1280,7 @@ external_url 'GENERATED_EXTERNAL_URL'
|
|||
# sidekiq['log_format'] = "json"
|
||||
# sidekiq['shutdown_timeout'] = 4
|
||||
# sidekiq['interval'] = nil
|
||||
# sidekiq['concurrency'] = nil
|
||||
# sidekiq['max_concurrency'] = 20
|
||||
# sidekiq['min_concurrency'] = nil
|
||||
# sidekiq['concurrency'] = 20
|
||||
|
||||
##! GitLab allows route a job to a particular queue determined by an array of ##! routing rules.
|
||||
##! Each routing rule is a tuple of queue selector query and corresponding queue. By default,
|
||||
|
|
|
@ -728,9 +728,7 @@ default['gitlab']['sidekiq']['health_checks_listen_port'] = 8092
|
|||
|
||||
# Cluster specific settings
|
||||
default['gitlab']['sidekiq']['interval'] = nil
|
||||
default['gitlab']['sidekiq']['concurrency'] = nil
|
||||
default['gitlab']['sidekiq']['max_concurrency'] = 20
|
||||
default['gitlab']['sidekiq']['min_concurrency'] = nil
|
||||
default['gitlab']['sidekiq']['concurrency'] = 20
|
||||
default['gitlab']['sidekiq']['queue_groups'] = ['*']
|
||||
default['gitlab']['sidekiq']['consul_service_name'] = 'sidekiq'
|
||||
default['gitlab']['sidekiq']['consul_service_meta'] = nil
|
||||
|
|
|
@ -22,12 +22,6 @@ exec chpst -e /opt/gitlab/etc/gitlab-rails/env -P \
|
|||
<% if node['gitlab']['sidekiq']['concurrency'] %>
|
||||
-c <%= node['gitlab']['sidekiq']['concurrency'] %> \
|
||||
<% end %>
|
||||
<% if node['gitlab']['sidekiq']['max_concurrency'] %>
|
||||
-m <%= node['gitlab']['sidekiq']['max_concurrency'] %> \
|
||||
<% end %>
|
||||
<% if node['gitlab']['sidekiq']['min_concurrency'] %>
|
||||
--min-concurrency <%= node['gitlab']['sidekiq']['min_concurrency'] %> \
|
||||
<% end %>
|
||||
<% if node['gitlab']['sidekiq']['shutdown_timeout'] %>
|
||||
--timeout <%= node['gitlab']['sidekiq']['shutdown_timeout'] %> \
|
||||
<% end %>
|
||||
|
|
|
@ -346,14 +346,14 @@ module Gitlab
|
|||
},
|
||||
{
|
||||
config_keys: %w(gitlab sidekiq min_concurrency),
|
||||
deprecation: '16.9',
|
||||
removal: '17.0',
|
||||
deprecation: '16.9', # Remove message issue: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8491
|
||||
removal: '17.0', # Removal issue: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/3422
|
||||
note: "Starting with GitLab 17.0, `sidekiq['min_concurrency']` will be removed. Please follow https://docs.gitlab.com/ee/administration/sidekiq/extra_sidekiq_processes.html#manage-thread-counts-explicitly to use `sidekiq['concurrency']` instead."
|
||||
},
|
||||
{
|
||||
config_keys: %w(gitlab sidekiq max_concurrency),
|
||||
deprecation: '16.9',
|
||||
removal: '17.0',
|
||||
deprecation: '16.9', # Remove message issue: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8491
|
||||
removal: '17.0', # Removal issue: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/3422
|
||||
note: "Starting with GitLab 17.0, `sidekiq['max_concurrency']` will be removed. Please follow https://docs.gitlab.com/ee/administration/sidekiq/extra_sidekiq_processes.html#manage-thread-counts-explicitly to use `sidekiq['concurrency']` instead."
|
||||
},
|
||||
{
|
||||
|
|
|
@ -26,7 +26,7 @@ RSpec.describe 'gitlab::sidekiq' do
|
|||
expect(content).to match(/rubyopt=\"-W:no-experimental\"/)
|
||||
expect(content).to include(%(RUBYOPT="${rubyopt}"))
|
||||
expect(content).to match(%r{bin/sidekiq-cluster})
|
||||
expect(content).to match(/-m 20/) # max_concurrency
|
||||
expect(content).to match(/-c 20/) # concurrency
|
||||
expect(content).to match(/--timeout 25/) # shutdown timeout
|
||||
expect(content).to match(/\*/) # all queues
|
||||
}
|
||||
|
@ -64,11 +64,19 @@ RSpec.describe 'gitlab::sidekiq' do
|
|||
before do
|
||||
stub_gitlab_rb(
|
||||
sidekiq: {
|
||||
log_group: 'fugee'
|
||||
log_group: 'fugee',
|
||||
concurrency: 42
|
||||
}
|
||||
)
|
||||
end
|
||||
it_behaves_like 'enabled logged service', 'sidekiq', true, { log_directory_owner: 'git', log_group: 'fugee' }
|
||||
|
||||
it 'correctly renders out the sidekiq service file' do
|
||||
expect(chef_run).to render_file("/opt/gitlab/sv/sidekiq/run")
|
||||
.with_content { |content|
|
||||
expect(content).to match(/-c 42/) # concurrency
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue