Merge branch 'sidekiq_concurrency' into 'master'

Add sidekiq concurrency setting.

Fixes #671 

Fixes #922

See merge request !547

CHANGELOG.md

@@ -3,6 +3,10 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
 
+8.3.0
+
+- Add sidekiq concurrency setting
+
 8.2.1
 
 - Expose artifacs configuration options 4aca77a5ae78a836cc9f3be060afacc3c4e72a28

files/gitlab-config-template/gitlab.rb.template

@@ -341,6 +341,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 
 # sidekiq['log_directory'] = "/var/log/gitlab/sidekiq"
 # sidekiq['shutdown_timeout'] = 4
+# sidekiq['concurrency'] = 25
 
 
 ################

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -255,6 +255,7 @@ default['gitlab']['sidekiq']['enable'] = true
 default['gitlab']['sidekiq']['ha'] = false
 default['gitlab']['sidekiq']['log_directory'] = "/var/log/gitlab/sidekiq"
 default['gitlab']['sidekiq']['shutdown_timeout'] = 4
+default['gitlab']['sidekiq']['concurrency'] = 25
 
 
 ###

files/gitlab-cookbooks/gitlab/definitions/sidekiq_service.rb

@@ -35,6 +35,7 @@ define :sidekiq_service, :rails_app => nil, :user => nil do
       :rails_app => rails_app,
       :user => user,
       :shutdown_timeout => node['gitlab'][svc]['shutdown_timeout'],
+      :concurrency => node['gitlab'][svc]['concurrency'],
       :log_directory => sidekiq_log_dir
     }.merge(params))
     log_options node['gitlab']['logging'].to_hash.merge(node['gitlab'][svc].to_hash)

files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb

@@ -18,4 +18,5 @@ exec chpst -e /opt/gitlab/etc/<%= @options[:rails_app] %>/env -P \
     -q default \
     -e <%= node['gitlab'][@options[:rails_app]]['environment'] %> \
     -r /opt/gitlab/embedded/service/<%= @options[:rails_app] %> \
-    -t <%= @options[:shutdown_timeout] %>
+    -t <%= @options[:shutdown_timeout] %> \
+    -c <%= @options[:concurrency] %>