Merge branch 'mg-deprecate-min-max-concurrency_add-concurrency' into 'master'

[Omnibus] Deprecate Sidekiq min-concurrency and max-concurrency

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7397

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Gregorius Marco <gmarco@gitlab.com>

Author: balasankarc

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

@@ -1255,6 +1255,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
 

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

@@ -708,7 +708,6 @@
 default['gitlab']['sidekiq']['log_directory'] = "/var/log/gitlab/sidekiq"
 default['gitlab']['sidekiq']['log_format'] = "json"
 default['gitlab']['sidekiq']['shutdown_timeout'] = 25
-default['gitlab']['sidekiq']['concurrency'] = 25
 default['gitlab']['sidekiq']['routing_rules'] = []
 
 # Sidekiq metrics server defaults
@@ -728,6 +727,7 @@
 # Cluster specific settings
 default['gitlab']['sidekiq']['queue_selector'] = false
 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']['negate'] = false

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

@@ -19,6 +19,9 @@ exec chpst -e /opt/gitlab/etc/gitlab-rails/env -P \
       <% if node['gitlab']['sidekiq']['interval'] %>
       -i <%= node['gitlab']['sidekiq']['interval'] %> \
       <% end %>
+      <% if node['gitlab']['sidekiq']['concurrency'] %>
+      -c <%= node['gitlab']['sidekiq']['concurrency'] %> \
+      <% end %>
       <% if node['gitlab']['sidekiq']['max_concurrency'] %>
       -m <%= node['gitlab']['sidekiq']['max_concurrency'] %> \
       <% end %>

files/gitlab-cookbooks/package/libraries/deprecations.rb

@@ -344,6 +344,18 @@ def list(existing_config = nil)
             removal: '17.0', # Removal issue: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8169
             note: "Starting with GitLab 17.0, this directive will be controlled by `postgres_exporter['flags'] = { 'collector.stat_user_tables' => bool }`."
           },
+          {
+            config_keys: %w(gitlab sidekiq min_concurrency),
+            deprecation: '16.9',
+            removal: '17.0',
+            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',
+            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."
+          }
         ]
 
         deprecations += praefect_legacy_configuration_deprecations