DaemonState: Catch CommandFailedError during stop

So that job teardown isn't hindered.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/orchestra/daemon.py b/teuthology/orchestra/daemon.py
index df2cf3f6ccf1e73445319f6c669164154a7614a7..18f873f3748745ffe0bdcaa2b0f092d312e76dd2 100644 (file)
--- a/teuthology/orchestra/daemon.py
+++ b/teuthology/orchestra/daemon.py
@@ -3,6 +3,7 @@ import struct
 
 from . import run
 from .. import misc
+from teuthology.exceptions import CommandFailedError
 
 log = logging.getLogger(__name__)
 
@@ -43,7 +44,10 @@ class DaemonState(object):
             return
         self.proc.stdin.close()
         self.log.debug('waiting for process to exit')
-        run.wait([self.proc], timeout=timeout)
+        try:
+            run.wait([self.proc], timeout=timeout)
+        except CommandFailedError:
+            log.exception("Error while waiting for process to exit")
         self.proc = None
         self.log.info('Stopped')