Merge remote-tracking branch 'origin/wip-11835' into greg-fs-testing

#453
ceph · Sep 16, 2015 · 1807963 · 1807963
2 parents 2f43e23 + f97fde6
commit 1807963
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/tasks/cephfs/fuse_mount.py b/tasks/cephfs/fuse_mount.py
@@ -7,6 +7,7 @@
 from textwrap import dedent
 
 from teuthology import misc
+from teuthology.contextutil import MaxWhileTries
 from teuthology.orchestra import run
 from teuthology.orchestra.run import CommandFailedError
 from .mount import CephFSMount
@@ -239,7 +240,12 @@ def umount_wait(self, force=False):
 
         try:
             if self.fuse_daemon:
-                self.fuse_daemon.wait()
+                # Permit a timeout, so that we do not block forever
+                run.wait([self.fuse_daemon], 900)
+        except MaxWhileTries:
+            log.error("process failed to terminate after unmount.  This probably"
+                      "indicates a bug within ceph-fuse.")
+            raise
         except CommandFailedError:
             pass