Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 14 insertions, 0 deletions

diff --git a/lib/gitlab/sidekiq_config.rb b/lib/gitlab/sidekiq_config.rb
index 3eef41a2ca2..ac9a7d25fc2 100644
--- a/lib/gitlab/sidekiq_config.rb
+++ b/lib/gitlab/sidekiq_config.rb
@@ -141,6 +141,20 @@ module Gitlab
           .to_h
       end
 
+      # Get the list of queues from all available workers following queue
+      # routing rules. Sidekiq::Queue.all fetches the list of queues from Redis.
+      # It may contain some redundant, obsolete queues from previous iterations
+      # of GitLab.
+      def routing_queues
+        @routing_queues ||= workers.map do |worker|
+          if worker.klass.is_a?(Gitlab::SidekiqConfig::DummyWorker)
+            worker.queue
+          else
+            ::Gitlab::SidekiqConfig::WorkerRouter.global.route(worker.klass)
+          end
+        end.uniq.sort
+      end
+
       private
 
       def find_workers(root, ee:, jh:)