From 4e15c4687972ba7d98fd643a1d23a96fbebdf8c4 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Fri, 30 Aug 2019 12:08:07 +0100 Subject: [PATCH] Kill process group if orphans are still alive after `proc.wait()`. Thanks @natefoo for the suggestion. --- lib/galaxy/jobs/runners/local.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/galaxy/jobs/runners/local.py b/lib/galaxy/jobs/runners/local.py index b9927b8d478..201376b2b6a 100644 --- a/lib/galaxy/jobs/runners/local.py +++ b/lib/galaxy/jobs/runners/local.py @@ -121,6 +121,8 @@ class LocalJobRunner(BaseJobRunner): proc.wait() # reap if terminated: return + elif check_pg(proc.pid): + kill_pg(proc.pid) finally: with self._proc_lock: self._procs.remove(proc)