From 207b0d84c717e317af94854f8494440615d0cd85 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 29 Oct 2018 13:44:27 +0000 Subject: [PATCH] Merge pull request #1074 from sharelatex/bg-fail-gracefully-on-copy-project-error handle failure in parallel copy GitOrigin-RevId: 67ad5ab9f31689ef66ea2cce75c99c72bf23df41 --- .../Features/Project/ProjectDuplicator.coffee | 15 +++++++++++++-- .../coffee/Project/ProjectDuplicatorTests.coffee | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectDuplicator.coffee b/services/web/app/coffee/Features/Project/ProjectDuplicator.coffee index 85880e5238..3ac138a974 100644 --- a/services/web/app/coffee/Features/Project/ProjectDuplicator.coffee +++ b/services/web/app/coffee/Features/Project/ProjectDuplicator.coffee @@ -34,10 +34,21 @@ module.exports = ProjectDuplicator = _copyFiles: (owner_id, newProject, originalProject_id, originalFolder, desFolder, callback)-> fileRefs = originalFolder.fileRefs or [] + firstError = null # track first error to exit gracefully from parallel copy jobs = fileRefs.map (file)-> return (cb)-> - ProjectEntityUpdateHandler.copyFileFromExistingProjectWithProject newProject, desFolder._id, originalProject_id, file, owner_id, cb - async.parallelLimit jobs, 5, callback + return async.setImmediate(cb) if firstError? # skip further copies if an error has occurred + ProjectEntityUpdateHandler.copyFileFromExistingProjectWithProject newProject, desFolder._id, originalProject_id, file, owner_id, (err) -> + firstError ||= err if err? # set the error flag if this copy failed + return cb() + # If one of these jobs fails then we wait until all running jobs have + # finished, skipping those which have not started yet. We need to wait + # for all the copy jobs to finish to avoid them writing to the project + # entry in the background while we are deleting it. + async.parallelLimit jobs, 5, (err) -> + return callback(firstError) if firstError? + return callback(err) if err? # shouldn't happen + return callback() _copyFolderRecursivly: (owner_id, newProject_id, originalProject_id, originalRootDoc, originalFolder, desFolder, docContents, callback)-> diff --git a/services/web/test/unit/coffee/Project/ProjectDuplicatorTests.coffee b/services/web/test/unit/coffee/Project/ProjectDuplicatorTests.coffee index 83989fb762..db001602ca 100644 --- a/services/web/test/unit/coffee/Project/ProjectDuplicatorTests.coffee +++ b/services/web/test/unit/coffee/Project/ProjectDuplicatorTests.coffee @@ -178,7 +178,7 @@ describe 'ProjectDuplicator', -> describe 'when there is an error', -> beforeEach -> - @rootFolder.fileRefs = [{name:"file0", _id:"file0"}, "BROKEN-FILE"] + @rootFolder.fileRefs = [{name:"file0", _id:"file0"}, "BROKEN-FILE", {name:"file1", _id:"file1"}, {name:"file2", _id:"file2"}] it 'should delete the broken cloned project', (done) -> @duplicator.duplicate @owner, @old_project_id, "", (err, newProject)=>