Cherry-pick over non-terminal-only job stop fix.

This commit is contained in:
Dannon Baker
2015-03-11 10:16:18 -04:00
parent d0667de0cf
commit f86a0c5d13
+3 -2
View File
@@ -156,10 +156,11 @@ class HDAManager( datasets.DatasetAssociationManager, secured.OwnableManagerMixi
self.dataset_manager.error_unless_dataset_purge_allowed( trans, hda )
super( HDAManager, self ).purge( trans, hda, flush=flush )
# signal to stop the creating job?
if hda.creating_job_associations:
job = hda.creating_job_associations[0].job
self.app.job_manager.job_stop_queue.put( job.id )
if not job.finished:
# signal to stop the creating job
self.app.job_manager.job_stop_queue.put( job.id )
# more importantly, purge dataset as well
if hda.dataset.user_can_purge: