Merge branch '262694-nomethoderror-in-elasticindexbulkcronworker' into 'master'

Do not update Elasticsearch for pending_delete projects

See merge request gitlab-org/gitlab!61917

ee/app/models/concerns/elastic/projects_search.rb

@@ -18,6 +18,14 @@ module Elastic
         ::Elastic::ProcessInitialBookkeepingService.track!(self)
       end
 
+      override :maintain_elasticsearch_update
+      def maintain_elasticsearch_update(updated_attributes: previous_changes.keys)
+        # avoid race condition if project is deleted before Elasticsearch update completes
+        return if pending_delete?
+
+        super
+      end
+
       override :maintain_elasticsearch_destroy
       def maintain_elasticsearch_destroy
         ElasticDeleteProjectWorker.perform_async(self.id, self.es_id)

ee/spec/models/concerns/elastic/project_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Project, :elastic do
+RSpec.describe Project, :elastic, :clean_gitlab_redis_shared_state do
   before do
     stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
   end
@@ -184,6 +184,17 @@ RSpec.describe Project, :elastic do
     expect(described_class.elastic_search('"someone_elses_project"', options: { project_ids: project_ids }).total_count).to eq(0)
   end
 
+  it 'does not update Elasticsearch if pending_delete is true' do
+    expect(Elastic::ProcessInitialBookkeepingService).to receive(:track!)
+    project = create(:project)
+
+    expect(Elastic::ProcessBookkeepingService).to receive(:track!)
+    project.update!(name: 'test 1')
+
+    expect(Elastic::ProcessBookkeepingService).not_to receive(:track!)
+    project.update!(pending_delete: true)
+  end
+
   it "finds partial matches in project names" do
     project_ids = []