From: Zack Cerza <zack@cerza.org>
Date: Tue, 3 Jun 2014 17:39:38 +0000 (-0500)
Subject: Add a timeout for unmounting
X-Git-Tag: 1.1.0~1419
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0f04af0799c7831cd0a75ea5e22ea414c9137514;p=teuthology.git

Add a timeout for unmounting

Ten minutes seems like it might be longer than necessary, but I doubt
it's too short.

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

diff --git a/teuthology/task/ceph_fuse.py b/teuthology/task/ceph_fuse.py
index 6031313a45..b97bc85384 100644
--- a/teuthology/task/ceph_fuse.py
+++ b/teuthology/task/ceph_fuse.py
@@ -168,7 +168,7 @@ def task(ctx, config):
                       ],
                   )
 
-        run.wait(fuse_daemons.itervalues())
+        run.wait(fuse_daemons.itervalues(), timeout=600)
 
         for id_, remote in clients:
             mnt = os.path.join(testdir, 'mnt.{id}'.format(id=id_))