Merge branch 'mg-sidekiq-version-queues' into 'master'

Register Sidekiq queues only from routing rules

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



Merged-by: Matthias Käppler <mkaeppler@gitlab.com>
Approved-by: Matthias Käppler <mkaeppler@gitlab.com>
Reviewed-by: Matthias Käppler <mkaeppler@gitlab.com>
Co-authored-by: Gregorius Marco <gmarco@gitlab.com>
Co-authored-by: Sylvester Chin <schin@gitlab.com>

lib/gitlab/sidekiq_versioning.rb

@@ -6,11 +6,13 @@ def self.install!
       # The Sidekiq client API always adds the queue to the Sidekiq queue
       # list, but mail_room and gitlab-shell do not. This is only necessary
       # for monitoring.
-      queues = SidekiqConfig.worker_queues
-
+      queues = ::Gitlab::SidekiqConfig.routing_queues
       if queues.any?
         Sidekiq.redis do |conn|
-          conn.sadd('queues', queues)
+          conn.multi do |multi|
+            multi.del('queues')
+            multi.sadd('queues', queues)
+          end
         end
       end
     rescue ::Redis::BaseError, SocketError, Errno::ENOENT, Errno::EADDRNOTAVAIL, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED

spec/lib/gitlab/sidekiq_versioning_spec.rb

@@ -4,16 +4,40 @@
 
 RSpec.describe Gitlab::SidekiqVersioning, :clean_gitlab_redis_queues do
   before do
-    allow(Gitlab::SidekiqConfig).to receive(:worker_queues).and_return(%w[foo bar])
+    allow(Gitlab::SidekiqConfig).to receive(:routing_queues).and_return(%w[foo bar])
   end
 
+  subject(:queues) { Sidekiq::Queue.all.map(&:name) }
+
   describe '.install!' do
     it 'registers all versionless and versioned queues with Redis' do
       described_class.install!
 
-      queues = Sidekiq::Queue.all.map(&:name)
       expect(queues).to include('foo')
       expect(queues).to include('bar')
     end
+
+    context 'when some queues outside routing rules were already registered' do
+      before do
+        Sidekiq.redis do |conn|
+          conn.sadd('queues', 'a', 'b', 'c', 'foo')
+        end
+      end
+
+      it 'removes the queues outside routing rules' do
+        described_class.install!
+
+        expect(queues).not_to include('a')
+        expect(queues).not_to include('b')
+        expect(queues).not_to include('c')
+      end
+
+      it 'registers all queues in routing rules' do
+        described_class.install!
+
+        expect(queues).to include('foo')
+        expect(queues).to include('bar')
+      end
+    end
   end
 end