Merge branch...

Merge branch '932-es-elastic-workers-should-check-settings-each-time-when-they-are-running' into 'master'

[ES] Elastic workers should check settings each time when they are running

Closes #932

See merge request !693

CHANGELOG-EE

@@ -4,6 +4,7 @@ v 8.12.0 (Unreleased)
 v 8.11.3 (Unreleased)
   - [ES] Add logging to indexer
   - Set the correct `GL_PROTOCOL` when rebasing !691
+  - [ES] Elasticsearch workers checks ES settings before running
 
 v 8.11.2
   - Additional documentation on protected branches for EE

app/workers/elastic_commit_indexer_worker.rb

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

app/workers/elastic_indexer_worker.rb

 class ElasticIndexerWorker
   include Sidekiq::Worker
   include Elasticsearch::Model::Client::ClassMethods
+  include Gitlab::CurrentSettings
 
   sidekiq_options queue: :elasticsearch, retry: 2
 
   ISSUE_TRACKED_FIELDS = %w(assignee_id author_id confidential)
 
   def perform(operation, class_name, record_id, options = {})
+    return true unless current_application_settings.elasticsearch_indexing?
+
     klass = class_name.constantize
 
     case operation.to_s

spec/workers/elastic_commit_indexer_worker_spec.rb

@@ -6,6 +6,10 @@ describe ElasticCommitIndexerWorker do
   subject { described_class.new }
 
   describe '#perform' do
+    before do
+      stub_application_setting(elasticsearch_indexing: true)
+    end
+
     it 'runs indexer' do
       expect_any_instance_of(Gitlab::Elastic::Indexer).to receive(:run)
       subject.perform(project.id, '0000', '0000')
@@ -27,5 +31,13 @@ describe ElasticCommitIndexerWorker do
 
       expect(subject.perform(project.id)).to be_truthy
     end
+
+    it 'returns true if ES disabled' do
+      stub_application_setting(elasticsearch_indexing: false)
+
+      expect_any_instance_of(Gitlab::Elastic::Indexer).not_to receive(:run)
+
+      expect(subject.perform(1)).to be_truthy
+    end
   end
 end