diff options
author | Robert Speicher <rspeicher@gmail.com> | 2018-11-26 17:55:21 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2018-11-26 17:55:21 +0000 |
commit | 4ec90095028b7519f64d209a9358831508dbf77f (patch) | |
tree | d844e9756c67d87839c699817a184782fce22a4f | |
parent | 890addcbf3362ffada5fc61daa28b40f06d3812c (diff) | |
parent | c02855f464dff8f490684619639f6f0e2ee8ed5e (diff) | |
download | gitlab-ce-4ec90095028b7519f64d209a9358831508dbf77f.tar.gz |
Merge branch 'ce-rd-extract-ee-specific-sidekiq-queue-config' into 'master'
Backport of gitlab-ee!8470
See merge request gitlab-org/gitlab-ce!23150
-rw-r--r-- | app/workers/all_queues.yml | 2 | ||||
-rw-r--r-- | doc/development/sidekiq_style_guide.md | 4 | ||||
-rw-r--r-- | lib/gitlab/sidekiq_config.rb | 9 | ||||
-rw-r--r-- | spec/workers/every_sidekiq_worker_spec.rb | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 953ab95735b..c0b410472eb 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -81,9 +81,9 @@ - todos_destroyer:todos_destroyer_confidential_issue - todos_destroyer:todos_destroyer_entity_leave +- todos_destroyer:todos_destroyer_group_private - todos_destroyer:todos_destroyer_project_private - todos_destroyer:todos_destroyer_private_features -- todos_destroyer:todos_destroyer_group_private - default - mailers # ActionMailer::DeliveryJob.queue_name diff --git a/doc/development/sidekiq_style_guide.md b/doc/development/sidekiq_style_guide.md index 76ff51446ba..8e268224c98 100644 --- a/doc/development/sidekiq_style_guide.md +++ b/doc/development/sidekiq_style_guide.md @@ -17,8 +17,8 @@ would be `process_something`. If you're not sure what queue a worker uses, you can find it using `SomeWorker.queue`. There is almost never a reason to manually override the queue name using `sidekiq_options queue: :some_queue`. -You must always add any new queues to `app/workers/all_queues.yml` otherwise -your worker will not run. +You must always add any new queues to `app/workers/all_queues.yml` or `ee/app/workers/all_queues.yml` +otherwise your worker will not run. ## Queue Namespaces diff --git a/lib/gitlab/sidekiq_config.rb b/lib/gitlab/sidekiq_config.rb index 01f60a98ad8..3b8de64913b 100644 --- a/lib/gitlab/sidekiq_config.rb +++ b/lib/gitlab/sidekiq_config.rb @@ -5,11 +5,18 @@ require 'set' module Gitlab module SidekiqConfig + QUEUE_CONFIG_PATHS = %w[app/workers/all_queues.yml ee/app/workers/all_queues.yml].freeze + # This method is called by `bin/sidekiq-cluster` in EE, which runs outside # of bundler/Rails context, so we cannot use any gem or Rails methods. def self.worker_queues(rails_path = Rails.root.to_s) @worker_queues ||= {} - @worker_queues[rails_path] ||= YAML.load_file(File.join(rails_path, 'app/workers/all_queues.yml')) + + @worker_queues[rails_path] ||= QUEUE_CONFIG_PATHS.flat_map do |path| + full_path = File.join(rails_path, path) + + File.exist?(full_path) ? YAML.load_file(full_path) : [] + end end # This method is called by `bin/sidekiq-cluster` in EE, which runs outside diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb index 2106959e23c..ebe02373275 100644 --- a/spec/workers/every_sidekiq_worker_spec.rb +++ b/spec/workers/every_sidekiq_worker_spec.rb @@ -9,7 +9,7 @@ describe 'Every Sidekiq worker' do expect(Gitlab::SidekiqConfig.cron_workers.map(&:queue)).to all(start_with('cronjob:')) end - it 'has its queue in app/workers/all_queues.yml', :aggregate_failures do + it 'has its queue in Gitlab::SidekiqConfig::QUEUE_CONFIG_PATHS', :aggregate_failures do file_worker_queues = Gitlab::SidekiqConfig.worker_queues.to_set worker_queues = Gitlab::SidekiqConfig.workers.map(&:queue).to_set @@ -17,10 +17,10 @@ describe 'Every Sidekiq worker' do worker_queues << 'default' missing_from_file = worker_queues - file_worker_queues - expect(missing_from_file).to be_empty, "expected #{missing_from_file.to_a.inspect} to be in app/workers/all_queues.yml" + expect(missing_from_file).to be_empty, "expected #{missing_from_file.to_a.inspect} to be in Gitlab::SidekiqConfig::QUEUE_CONFIG_PATHS" unncessarily_in_file = file_worker_queues - worker_queues - expect(unncessarily_in_file).to be_empty, "expected #{unncessarily_in_file.to_a.inspect} not to be in app/workers/all_queues.yml" + expect(unncessarily_in_file).to be_empty, "expected #{unncessarily_in_file.to_a.inspect} not to be in Gitlab::SidekiqConfig::QUEUE_CONFIG_PATHS" end it 'has its queue or namespace in config/sidekiq_queues.yml', :aggregate_failures do |