Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/bulk_imports')
-rw-r--r--lib/bulk_imports/common/extractors/ndjson_extractor.rb2
-rw-r--r--lib/bulk_imports/common/pipelines/lfs_objects_pipeline.rb4
-rw-r--r--lib/bulk_imports/common/pipelines/uploads_pipeline.rb4
3 files changed, 7 insertions, 3 deletions
diff --git a/lib/bulk_imports/common/extractors/ndjson_extractor.rb b/lib/bulk_imports/common/extractors/ndjson_extractor.rb
index 04febebff8e..e1a0e5cf2fb 100644
--- a/lib/bulk_imports/common/extractors/ndjson_extractor.rb
+++ b/lib/bulk_imports/common/extractors/ndjson_extractor.rb
@@ -33,7 +33,7 @@ module BulkImports
def download_service(context)
@download_service ||= BulkImports::FileDownloadService.new(
configuration: context.configuration,
- relative_url: context.entity.relation_download_url_path(relation),
+ relative_url: context.entity.relation_download_url_path(relation, context.extra[:batch_number]),
tmpdir: tmpdir,
filename: filename
)
diff --git a/lib/bulk_imports/common/pipelines/lfs_objects_pipeline.rb b/lib/bulk_imports/common/pipelines/lfs_objects_pipeline.rb
index 68bd64dc2ff..0bf4d341aad 100644
--- a/lib/bulk_imports/common/pipelines/lfs_objects_pipeline.rb
+++ b/lib/bulk_imports/common/pipelines/lfs_objects_pipeline.rb
@@ -6,6 +6,8 @@ module BulkImports
class LfsObjectsPipeline
include Pipeline
+ file_extraction_pipeline!
+
def extract(_context)
download_service.execute
decompression_service.execute
@@ -48,7 +50,7 @@ module BulkImports
def download_service
BulkImports::FileDownloadService.new(
configuration: context.configuration,
- relative_url: context.entity.relation_download_url_path(relation),
+ relative_url: context.entity.relation_download_url_path(relation, context.extra[:batch_number]),
tmpdir: tmpdir,
filename: targz_filename
)
diff --git a/lib/bulk_imports/common/pipelines/uploads_pipeline.rb b/lib/bulk_imports/common/pipelines/uploads_pipeline.rb
index 06132791ea6..81ce20db9ab 100644
--- a/lib/bulk_imports/common/pipelines/uploads_pipeline.rb
+++ b/lib/bulk_imports/common/pipelines/uploads_pipeline.rb
@@ -10,6 +10,8 @@ module BulkImports
AvatarLoadingError = Class.new(StandardError)
+ file_extraction_pipeline!
+
def extract(_context)
download_service.execute
decompression_service.execute
@@ -46,7 +48,7 @@ module BulkImports
def download_service
BulkImports::FileDownloadService.new(
configuration: context.configuration,
- relative_url: context.entity.relation_download_url_path(relation),
+ relative_url: context.entity.relation_download_url_path(relation, context.extra[:batch_number]),
tmpdir: tmpdir,
filename: targz_filename
)