Merge branch 'remove-force-mirror-scheduling-from-project-import-worker' into 'master'

Forces import worker with mirror to insert mirror in front of queue

See merge request !2231

app/workers/repository_import_worker.rb

@@ -26,9 +26,9 @@ class RepositoryImportWorker
     project.repository.after_import
     project.import_finish
 
-    # Explicitly schedule mirror for update so
+    # Explicitly enqueue mirror for update so
     # that upstream remote is created and fetched
-    project.import_schedule if project.mirror?
+    project.force_import_job! if project.mirror?
   rescue ImportError => ex
     fail_import(project, ex.message)
     raise

app/workers/update_all_mirrors_worker.rb

@@ -15,8 +15,9 @@ class UpdateAllMirrorsWorker
 
     fail_stuck_mirrors!
 
-    return if Gitlab::Mirror.max_mirror_capacity_reached?
-    Project.mirrors_to_sync.find_each(batch_size: 200, &:import_schedule)
+    unless Gitlab::Mirror.max_mirror_capacity_reached?
+      Project.mirrors_to_sync.find_each(batch_size: 200, &:import_schedule)
+    end
 
     cancel_lease(lease_uuid)
   end

changelogs/unreleased-ee/remove-force-mirror-scheduling-from-project-import-worker.yml

+---
+title: Forces import worker with mirror to insert mirror in front of queue
+merge_request: 2231
+author:

spec/models/project_spec.rb

@@ -1744,9 +1744,9 @@ describe Project, models: true do
     context 'with a mirrored project' do
       let(:project) { create(:empty_project, :mirror) }
 
-      it 'first calls RepositoryImportWorker and RepositoryUpdateMirrorWorker after' do
+      it 'calls RepositoryImportWorker and inserts in front of the mirror scheduler queue' do
         allow_any_instance_of(Project).to receive(:repository_exists?).and_return(false, true)
-        expect_any_instance_of(RepositoryUpdateMirrorWorker).to receive(:perform).with(project.id)
+        expect_any_instance_of(EE::Project).to receive(:force_import_job!)
         expect_any_instance_of(RepositoryImportWorker).to receive(:perform).with(project.id).and_call_original
 
         project.import_schedule

spec/workers/repository_import_worker_spec.rb

@@ -18,6 +18,19 @@ describe RepositoryImportWorker do
       end
     end
 
+    context 'when project is a mirror' do
+      let(:project) { create(:empty_project, :mirror, :import_scheduled) }
+
+      it 'adds mirror in front of the mirror scheduler queue' do
+        expect_any_instance_of(Projects::ImportService).to receive(:execute)
+          .and_return({ status: :ok })
+
+        expect_any_instance_of(EE::Project).to receive(:force_import_job!)
+
+        subject.perform(project.id)
+      end
+    end
+
     context 'when the import has failed' do
       it 'hide the credentials that were used in the import URL' do
         error = %q{remote: Not Found fatal: repository 'https://user:pass@test.com/root/repoC.git/' not found }