Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/app/workers/bulk_imports/relation_batch_export_worker.rb b/app/workers/bulk_imports/relation_batch_export_worker.rb
index 4ce36929e15..b3acf3ee01b 100644
--- a/app/workers/bulk_imports/relation_batch_export_worker.rb
+++ b/app/workers/bulk_imports/relation_batch_export_worker.rb
@@ -10,7 +10,13 @@ module BulkImports
     sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION
 
     def perform(user_id, batch_id)
-      RelationBatchExportService.new(user_id, batch_id).execute
+      @user = User.find(user_id)
+      @batch = BulkImports::ExportBatch.find(batch_id)
+
+      log_extra_metadata_on_done(:relation, @batch.export.relation)
+      log_extra_metadata_on_done(:objects_count, @batch.objects_count)
+
+      RelationBatchExportService.new(@user, @batch).execute
     end
   end
 end