Disable object_storage for export task

- log error if there are import_export_shared errors
- extract disable_upload_object_storage for both import and export task

lib/gitlab/import_export/project/base_task.rb

@@ -26,6 +26,24 @@ module Gitlab
           }
         end
 
+        def disable_upload_object_storage
+          overwrite_uploads_setting('background_upload', false) do
+            overwrite_uploads_setting('direct_upload', false) do
+              yield
+            end
+          end
+        end
+
+        def overwrite_uploads_setting(key, value)
+          old_value = Settings.uploads.object_store[key]
+          Settings.uploads.object_store[key] = value
+
+          yield
+
+        ensure
+          Settings.uploads.object_store[key] = old_value
+        end
+
         def success(message)
           logger.info(message)
 

lib/gitlab/import_export/project/export_task.rb

@@ -19,6 +19,8 @@ module Gitlab
               .execute(Gitlab::ImportExport::AfterExportStrategies::MoveFileStrategy.new(archive_path: file_path), measurement_options)
           end
 
+          return error(project.import_export_shared.errors.join(', ')) if project.import_export_shared.errors.any?
+
           success('Done!')
         end
 
@@ -32,6 +34,10 @@ module Gitlab
 
         def with_export
           with_request_store do
+            # We are disabling ObjectStorage for `export`
+            # since when direct upload is enabled, remote storage will be used
+            # and Gitlab::ImportExport::AfterExportStrategies::MoveFileStrategy will fail to copy exported archive
+            disable_upload_object_storage do
               ::Gitlab::GitalyClient.allow_n_plus_1_calls do
                 yield
               end
@@ -40,4 +46,5 @@ module Gitlab
         end
       end
     end
+  end
 end

lib/gitlab/import_export/project/import_task.rb

@@ -67,24 +67,6 @@ module Gitlab
           Sidekiq::Worker.drain_all
         end
 
-        def disable_upload_object_storage
-          overwrite_uploads_setting('background_upload', false) do
-            overwrite_uploads_setting('direct_upload', false) do
-              yield
-            end
-          end
-        end
-
-        def overwrite_uploads_setting(key, value)
-          old_value = Settings.uploads.object_store[key]
-          Settings.uploads.object_store[key] = value
-
-          yield
-
-        ensure
-          Settings.uploads.object_store[key] = old_value
-        end
-
         def full_path
           "#{namespace.full_path}/#{project_path}"
         end