From f86a0c5d13c61b01129cbb7446e6766dc1f19938 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 10 Mar 2015 14:56:55 -0400 Subject: [PATCH] Cherry-pick over non-terminal-only job stop fix. --- lib/galaxy/managers/hdas.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/managers/hdas.py b/lib/galaxy/managers/hdas.py index 51becef506f..79350a1890d 100644 --- a/lib/galaxy/managers/hdas.py +++ b/lib/galaxy/managers/hdas.py @@ -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: