Give daemons a five-minute timeout for stopping

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

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 39507be1c553347482a752d5449e8d9eb4abeffb..1d2fb386da0bc0a56c6f62e2ddebe7d093a9a20d 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -44,19 +44,21 @@ class DaemonState(object):
         self.log = command_kwargs.get('logger', log)
         self.proc = None
 
-    def stop(self):
+    def stop(self, timeout=300):
         """
         Stop this daemon instance.
 
         Note: this can raise a run.CommandFailedError,
         run.CommandCrashedError, or run.ConnectionLostError.
+
+        :param timeout: timeout to pass to orchestra.run.wait()
         """
         if not self.running():
             self.log.error('tried to stop a non-running daemon')
             return
         self.proc.stdin.close()
         self.log.debug('waiting for process to exit')
-        run.wait([self.proc])
+        run.wait([self.proc], timeout=timeout)
         self.proc = None
         self.log.info('Stopped')