ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stop processing new parallel importers when failed 

fixes CORE-2200

test plan
 - cause an import to fail
 - no future parallel importers should process

Change-Id: I9d008434a39913037505e9cc4a64be299cfec0d1
Reviewed-on: https://gerrit.instructure.com/173645
Tested-by: Jenkins
Reviewed-by: James Williams <jamesw@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
This commit is contained in:
Rob Orton 2018-11-28 16:40:18 -07:00
parent a9ef23d640
commit a7f1715ba5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/sis/csv/import_refactored.rb
View File

@ -212,7 +212,7 @@ module SIS
def run_parallel_importer(id, csv: nil) def run_parallel_importer(id, csv: nil)
parallel_importer = id.is_a?(ParallelImporter) ? id : ParallelImporter.find(id) parallel_importer = id.is_a?(ParallelImporter) ? id : ParallelImporter.find(id)
if @batch.workflow_state == 'aborted' if should_stop_import?
parallel_importer.abort parallel_importer.abort
return return
end end
@ -238,7 +238,7 @@ module SIS
file&.close file&.close
unless @run_immediately unless @run_immediately
if is_last_parallel_importer_of_type?(parallel_importer) if is_last_parallel_importer_of_type?(parallel_importer)
queue_next_importer_set unless %w{aborted failed failed_with_messages}.include?(@batch.workflow_state) queue_next_importer_set unless should_stop_import?
end end
end end
end end
@ -262,7 +262,9 @@ module SIS
end end
end end
private def should_stop_import?
%w{aborted failed failed_with_messages}.include?(@batch.workflow_state)
end
def run_all_importers def run_all_importers
IMPORTERS.each do |importer_type| IMPORTERS.each do |importer_type|
@ -271,7 +273,7 @@ module SIS
importers.each do |pi| importers.each do |pi|
run_parallel_importer(pi, csv: @csvs[importer_type].detect{|csv| csv[:attachment] == pi.attachment}) run_parallel_importer(pi, csv: @csvs[importer_type].detect{|csv| csv[:attachment] == pi.attachment})
@batch.data[:completed_importers] << importer_type @batch.data[:completed_importers] << importer_type
return false if %w{aborted failed failed_with_messages}.include?(@batch.workflow_state) return false if should_stop_import?
end end
end end
@parallel_importers.each do |type, importers| @parallel_importers.each do |type, importers|