Merge branch 'es_separate_issue' into 'master'

Make Elasticsearch indexer run as an async task

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

See merge request !555

CHANGELOG-EE

@@ -5,6 +5,7 @@ v 8.10.0 (unreleased)
   - Fix EE keys fingerprint add index migration if came from CE
   - Add todos for MR approvers !547
   - Isolate EE LDAP library code in EE module (Part 1) !511
+  - Make Elasticsearch indexer run as an async task
 
 v 8.9.6
   - Avoid adding index for key fingerprint if it already exists. !539

app/services/git_push_service.rb

@@ -74,17 +74,9 @@ class GitPushService < BaseService
     CreateCommitBuildsService.new.execute(@project, current_user, build_push_data, mirror_update: mirror_update)
     ProjectCacheWorker.perform_async(@project.id)
 
-    index_commits_blobs if current_application_settings.elasticsearch_indexing?
-  end
-
-  def index_commits_blobs
-    indexer = Gitlab::Elastic::Indexer.new
-    indexer.run(
-      @project.id,
-      project.repository.path_to_repo,
-      params[:oldrev],
-      params[:newrev]
-    )
+    if current_application_settings.elasticsearch_indexing?
+      ElasticCommitIndexerWorker.perform_async(@project.id, params[:oldrev], params[:newrev])
+    end
   end
 
   def perform_housekeeping

app/workers/elastic_commit_indexer_worker.rb

+class ElasticCommitIndexerWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: :elasticsearch
+
+  def perform(project_id, oldrev, newrev)
+    project = Project.find(project_id)
+
+    indexer = Gitlab::Elastic::Indexer.new
+    indexer.run(
+      project_id,
+      project.repository.path_to_repo,
+      oldrev,
+      newrev
+    )
+  end
+end

spec/workers/elastic_commit_indexer_worker_spec.rb

+require 'spec_helper'
+
+describe ElasticCommitIndexerWorker do
+  let(:project) { create(:project) }
+
+  subject { described_class.new }
+
+  describe '#perform' do
+    it 'runs indexer' do
+      expect_any_instance_of(Gitlab::Elastic::Indexer).to receive(:run)
+      subject.perform(project.id, '0000', '0000')
+    end
+  end
+end