From cae9ce603e4460ef8af8a7e4e845510014ed70d0 Mon Sep 17 00:00:00 2001
From: Gregorius Marco <gmarco@gitlab.com>
Date: Wed, 24 Apr 2024 03:59:55 +0000
Subject: [PATCH] Remove queue_selector and negate options from Sidekiq

https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/2220

Changelog: removed
---
 files/gitlab-cookbooks/gitlab/attributes/default.rb       | 2 --
 .../gitlab/templates/default/sv-sidekiq-run.erb           | 6 ------
 files/gitlab-cookbooks/package/libraries/deprecations.rb  | 8 ++++----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index 29ec991d0..e099c76fa 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -727,12 +727,10 @@ default['gitlab']['sidekiq']['health_checks_listen_address'] = "127.0.0.1"
 default['gitlab']['sidekiq']['health_checks_listen_port'] = 8092
 
 # 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
 default['gitlab']['sidekiq']['queue_groups'] = ['*']
 default['gitlab']['sidekiq']['consul_service_name'] = 'sidekiq'
 default['gitlab']['sidekiq']['consul_service_meta'] = nil
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb b/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb
index fed36bb0d..8ecfcef90 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb
@@ -28,17 +28,11 @@ exec chpst -e /opt/gitlab/etc/gitlab-rails/env -P \
       <% if node['gitlab']['sidekiq']['min_concurrency'] %>
       --min-concurrency <%= node['gitlab']['sidekiq']['min_concurrency'] %> \
       <% end %>
-      <% if node['gitlab']['sidekiq']['queue_selector'] %>
-      --queue-selector \
-      <% end %>
       <% if node['gitlab']['sidekiq']['shutdown_timeout'] %>
       --timeout <%= node['gitlab']['sidekiq']['shutdown_timeout'] %> \
       <% end %>
       <% node['gitlab']['sidekiq']['queue_groups'].each do |queue| %>
         "<%= queue %>" \
       <% end %>
-      <% if node['gitlab']['sidekiq']['negate'] %>
-      --negate \
-      <% end %>
 
 # Do not remove this line; it prevents trouble with the trailing backslashes above.
diff --git a/files/gitlab-cookbooks/package/libraries/deprecations.rb b/files/gitlab-cookbooks/package/libraries/deprecations.rb
index cc77ed96f..da2c0c611 100644
--- a/files/gitlab-cookbooks/package/libraries/deprecations.rb
+++ b/files/gitlab-cookbooks/package/libraries/deprecations.rb
@@ -328,14 +328,14 @@ module Gitlab
           },
           {
             config_keys: %w(gitlab sidekiq queue_selector),
-            deprecation: '15.9',
-            removal: '17.0',
+            deprecation: '15.9', # Remove message issue: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8495
+            removal: '17.0', # Removal issue: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/2220
             note: "Starting with GitLab 17.0, running Sidekiq with queue selector (`sidekiq['queue_selector'] = true`) will be removed. We recommend to follow the steps at https://docs.gitlab.com/ee/administration/sidekiq/extra_sidekiq_processes.html#start-multiple-processes, to run Sidekiq with multiple processes while listening to all queues."
           },
           {
             config_keys: %w(gitlab sidekiq negate),
-            deprecation: '15.9',
-            removal: '17.0',
+            deprecation: '15.9', # Remove message issue: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8495
+            removal: '17.0', # Removal issue: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/2220
             note: "Starting with GitLab 17.0, running Sidekiq with negate (`sidekiq['negate'] = true`) will be removed. We recommend to follow the steps at https://docs.gitlab.com/ee/administration/sidekiq/extra_sidekiq_processes.html#start-multiple-processes, to run Sidekiq with multiple processes while listening to all queues."
           },
           {