From d9a7f2fadb190b0cc5543744f56a39f77d865ae9 Mon Sep 17 00:00:00 2001
From: Matthew Jones <matburt@redhat.com>
Date: Mon, 30 Jan 2017 13:38:38 -0500
Subject: [PATCH] Silently ignore psutil errors when the process is already
 gone

During ssh CP cleanuip
---
 awx/lib/tower_display_callback/cleanup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/awx/lib/tower_display_callback/cleanup.py b/awx/lib/tower_display_callback/cleanup.py
index ad99fb20bb..8926e54f72 100644
--- a/awx/lib/tower_display_callback/cleanup.py
+++ b/awx/lib/tower_display_callback/cleanup.py
@@ -71,7 +71,10 @@ def terminate_ssh_control_masters():
     # Terminate then kill control master processes.  Workaround older
     # version of psutil that may not have wait_procs implemented.
     for proc in ssh_cm_procs:
-        proc.terminate()
+        try:
+            proc.terminate()
+        except psutil.NoSuchProcess:
+            continue
     procs_gone, procs_alive = psutil.wait_procs(ssh_cm_procs, timeout=5)
     for proc in procs_alive:
         proc.kill()