Merge branch '2108-split-elasticsearch-sidekiq-queue-in-two' into 'master'

Give each elasticsearch worker its own sidekiq queue

Closes #2108

See merge request !1598

app/workers/elastic_commit_indexer_worker.rb

 class ElasticCommitIndexerWorker
   include Sidekiq::Worker
+  include DedicatedSidekiqQueue
   include Gitlab::CurrentSettings
 
-  sidekiq_options queue: :elasticsearch, retry: 2
+  sidekiq_options retry: 2
 
   def perform(project_id, oldrev = nil, newrev = nil)
     return true unless current_application_settings.elasticsearch_indexing?

app/workers/elastic_indexer_worker.rb

 class ElasticIndexerWorker
   include Sidekiq::Worker
+  include DedicatedSidekiqQueue
   include Elasticsearch::Model::Client::ClassMethods
   include Gitlab::CurrentSettings
 
-  sidekiq_options queue: :elasticsearch, retry: 2
+  sidekiq_options retry: 2
 
   ISSUE_TRACKED_FIELDS = %w(assignee_id author_id confidential).freeze
 

changelogs/unreleased-ee/2108-split-elasticsearch-sidekiq-queue-in-two.yml

+---
+title: Give each elasticsearch worker its own sidekiq queue
+merge_request:
+author:

config/sidekiq_queues.yml

@@ -54,11 +54,12 @@
   - [pages, 1]
   - [system_hook_push, 1]
   # EE specific queues
-  - [elasticsearch, 1]
   - [geo, 1]
   - [project_mirror, 1]
   - [project_update_repository_storage, 1]
   - [admin_emails, 1]
   - [geo_repository_update, 1]
   - [elastic_batch_project_indexer, 1]
+  - [elastic_indexer_worker, 1]
+  - [elastic_commit_indexer_worker, 1]
   - [export_csv, 1]