External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Set recursive on child process canceling

Browse Source 
Sometimes ansible spawns many subprocesses that can get orphaned and
stuck if we only kill the direct descendent child processes
This commit is contained in:
Matthew Jones 2015-08-05 11:44:50 -04:00
parent b01c2d2ad1
commit 31b8491d53
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
awx/main/tasks.py
View File

@ -432,7 +432,19 @@ class BaseTask(Task):
instance = self.update_model(instance.pk)
if instance.cancel_flag:
try:
os.kill(child.pid, signal.SIGINT)
if settings.AWX_PROOT_ENABLED:
if not psutil:
os.kill(child.pid, signal.SIGKILL)
else:
main_proc = psutil.Process(pid=child.pid)
if hasattr(main_proc, "children"):
child_procs = main_proc.children(recursive=True)
else:
child_procs = main_proc.get_children(recursive=True)
for child_proc in child_procs:
os.kill(child_proc.pid, signal.SIGTERM)
else:
os.kill(child.pid, signal.SIGTERM)
time.sleep(3)
canceled = True
except OSError: