Merge branch '32648-dont-index-the-same-project-at-the-same-time' into 'master'

Add exclusive lock on project in ElasticCommitIndexerWorker

Closes #32648

See merge request gitlab-org/gitlab!35842

ee/app/workers/elastic_commit_indexer_worker.rb

@@ -3,6 +3,7 @@
 class ElasticCommitIndexerWorker
   include ApplicationWorker
   prepend Elastic::IndexingControl
+  include Gitlab::ExclusiveLeaseHelpers
 
   feature_category :global_search
   sidekiq_options retry: 2
@@ -24,6 +25,8 @@ class ElasticCommitIndexerWorker
     project = Project.find(project_id)
     return true unless project.use_elasticsearch?
 
-    Gitlab::Elastic::Indexer.new(project, wiki: wiki).run
+    in_lock("#{self.class.name}/#{project_id}/#{wiki}", ttl: 1.hour, retries: 0) do
+      Gitlab::Elastic::Indexer.new(project, wiki: wiki).run
+    end
   end
 end

ee/changelogs/unreleased/32648-dont-index-the-same-project-at-the-same-time.yml

+---
+title: Don't index the same project in Elasticsearch in parallel
+merge_request: 35842
+author:
+type: performance

ee/spec/workers/elastic_commit_indexer_worker_spec.rb

@@ -34,5 +34,14 @@ RSpec.describe ElasticCommitIndexerWorker do
 
       subject.perform(project.id, nil, nil, true)
     end
+
+    it 'does not run index when it is locked' do
+      expect(subject).to receive(:in_lock) # Mock and don't yield
+        .with("ElasticCommitIndexerWorker/#{project.id}/false", ttl: 1.hour, retries: 0)
+
+      expect(Gitlab::Elastic::Indexer).not_to receive(:new)
+
+      subject.perform(project.id)
+    end
   end
 end