Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

3 files changed, 74 insertions, 21 deletions

diff --git a/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb b/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb
index c8e744ab262..321ad7d3238 100644
--- a/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb
@@ -12,6 +12,7 @@ RSpec.describe Gitlab::GithubImport::Importer::DiffNoteImporter, :aggregate_fail
   let(:updated_at) { Time.new(2017, 1, 1, 12, 15).utc }
   let(:note_body) { 'Hello' }
   let(:file_path) { 'files/ruby/popen.rb' }
+  let(:end_line) { 15 }
 
   let(:diff_hunk) do
     '@@ -14 +14 @@
@@ -31,7 +32,7 @@ RSpec.describe Gitlab::GithubImport::Importer::DiffNoteImporter, :aggregate_fail
       created_at: created_at,
       updated_at: updated_at,
       start_line: nil,
-      end_line: 15,
+      end_line: end_line,
       github_id: 1,
       diff_hunk: diff_hunk,
       side: 'RIGHT'
@@ -173,7 +174,24 @@ RSpec.describe Gitlab::GithubImport::Importer::DiffNoteImporter, :aggregate_fail
             NOTE
         end
 
-        context 'when the note diff file creation fails' do
+        context 'when the note diff file creation fails with DiffNoteCreationError due to outdated suggestion' do
+          let(:end_line) { nil }
+
+          it 'falls back to the LegacyDiffNote' do
+            expect(Gitlab::GithubImport::Logger)
+              .to receive(:warn)
+                    .with(
+                      message: "Validation failed: Line code can't be blank, Line code must be a valid line code, Position is incomplete",
+                      'error.class': 'Gitlab::GithubImport::Importer::DiffNoteImporter::DiffNoteCreationError'
+                    )
+
+            expect { subject.execute }
+              .to change(LegacyDiffNote, :count)
+                    .and not_change(DiffNote, :count)
+          end
+        end
+
+        context 'when the note diff file creation fails with NoteDiffFileCreationError' do
           it 'falls back to the LegacyDiffNote' do
             exception = ::DiffNote::NoteDiffFileCreationError.new('Failed to create diff note file')
 
diff --git a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
index a70ff0bd82d..c1b0f4df29a 100644
--- a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
@@ -104,8 +104,13 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestsImporter do
         .and_yield(pull_request)
 
       expect(Gitlab::GithubImport::ImportPullRequestWorker)
-        .to receive(:perform_async)
-        .with(project.id, an_instance_of(Hash), an_instance_of(String))
+        .to receive(:bulk_perform_in)
+        .with(
+          1.second,
+          [[project.id, an_instance_of(Hash), an_instance_of(String)]],
+          batch_delay: 1.minute,
+          batch_size: 200
+        )
 
       waiter = importer.parallel_import
 
diff --git a/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb b/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb
index f375e84e0fd..6a19afbc60d 100644
--- a/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb
+++ b/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb
@@ -22,6 +22,10 @@ RSpec.describe Gitlab::GithubImport::ParallelScheduling do
       def collection_method
         :issues
       end
+
+      def parallel_import_batch
+        { size: 10, delay: 1.minute }
+      end
     end
   end
 
@@ -254,35 +258,61 @@ RSpec.describe Gitlab::GithubImport::ParallelScheduling do
 
   describe '#parallel_import' do
     let(:importer) { importer_class.new(project, client) }
+    let(:repr_class) { double(:representation) }
+    let(:worker_class) { double(:worker) }
+    let(:object) { double(:object) }
+    let(:batch_size) { 200 }
+    let(:batch_delay) { 1.minute }
 
-    it 'imports data in parallel' do
-      repr_class = double(:representation)
-      worker_class = double(:worker)
-      object = double(:object)
-
-      expect(importer)
-        .to receive(:each_object_to_import)
-        .and_yield(object)
-
-      expect(importer)
+    before do
+      allow(importer)
         .to receive(:representation_class)
         .and_return(repr_class)
 
-      expect(importer)
+      allow(importer)
         .to receive(:sidekiq_worker_class)
         .and_return(worker_class)
 
-      expect(repr_class)
+      allow(repr_class)
         .to receive(:from_api_response)
         .with(object)
         .and_return({ title: 'Foo' })
+    end
+
+    context 'with multiple objects' do
+      before do
+        allow(importer).to receive(:parallel_import_batch) { { size: batch_size, delay: batch_delay } }
+        expect(importer).to receive(:each_object_to_import).and_yield(object).and_yield(object).and_yield(object)
+      end
 
-      expect(worker_class)
-        .to receive(:perform_async)
-        .with(project.id, { title: 'Foo' }, an_instance_of(String))
+      it 'imports data in parallel batches with delays' do
+        expect(worker_class).to receive(:bulk_perform_in).with(1.second, [
+          [project.id, { title: 'Foo' }, an_instance_of(String)],
+          [project.id, { title: 'Foo' }, an_instance_of(String)],
+          [project.id, { title: 'Foo' }, an_instance_of(String)]
+        ], batch_size: batch_size, batch_delay: batch_delay)
+
+        importer.parallel_import
+      end
+    end
 
-      expect(importer.parallel_import)
-        .to be_an_instance_of(Gitlab::JobWaiter)
+    context 'when FF is disabled' do
+      before do
+        stub_feature_flags(spread_parallel_import: false)
+      end
+
+      it 'imports data in parallel' do
+        expect(importer)
+          .to receive(:each_object_to_import)
+          .and_yield(object)
+
+        expect(worker_class)
+          .to receive(:perform_async)
+          .with(project.id, { title: 'Foo' }, an_instance_of(String))
+
+        expect(importer.parallel_import)
+          .to be_an_instance_of(Gitlab::JobWaiter)
+      end
     end
   end