Merge branch 'es_fix_for_imports' into 'master'

Dicouple an ES index update from RepositoryUpdateMirrorWorker

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/812

See merge request !593

CHANGELOG-EE

@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.11.0 (unreleased)
 
 v 8.10.2 (unreleased)
+  - Dicouple an ES index update from RepositoryUpdateMirrorWorker
 
 v 8.10.1
   - No EE-specific changes

app/models/project.rb

@@ -240,8 +240,7 @@ class Project < ActiveRecord::Base
       end
 
       if current_application_settings.elasticsearch_indexing?
-        project.repository.index_blobs
-        project.repository.index_commits
+        ElasticCommitIndexerWorker.perform_async(project.id)
       end
     end
 

app/workers/elastic_commit_indexer_worker.rb

@@ -3,13 +3,16 @@ class ElasticCommitIndexerWorker
 
   sidekiq_options queue: :elasticsearch
 
-  def perform(project_id, oldrev, newrev)
+  def perform(project_id, oldrev = nil, newrev = nil)
     project = Project.find(project_id)
+    repository = project.repository
+
+    return true unless repository.exists? && !repository.empty?
 
     indexer = Gitlab::Elastic::Indexer.new
     indexer.run(
       project_id,
-      project.repository.path_to_repo,
+      repository.path_to_repo,
       oldrev,
       newrev
     )

spec/workers/elastic_commit_indexer_worker_spec.rb

@@ -10,5 +10,13 @@ describe ElasticCommitIndexerWorker do
       expect_any_instance_of(Gitlab::Elastic::Indexer).to receive(:run)
       subject.perform(project.id, '0000', '0000')
     end
+
+    it 'does not run indexer when project is empty' do
+      empty_project = create :empty_project
+
+      expect_any_instance_of(Gitlab::Elastic::Indexer).not_to receive(:run)
+
+      subject.perform(empty_project.id, '0000', '0000')
+    end
   end
 end