]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks: allow custom timeout for umount_wait()
authorRishabh Dave <ridave@redhat.com>
Fri, 13 Apr 2018 06:11:30 +0000 (06:11 +0000)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 15 May 2018 22:34:05 +0000 (15:34 -0700)
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 18a9d0c49175c9aacfaec15d28125c8fb2a77b51)

qa/tasks/cephfs/fuse_mount.py

index 8d8410c69edce471954f347a10b0759964feaf99..6c14ecd227ed2905cd027b326af6b84b715aaece 100644 (file)
@@ -261,7 +261,7 @@ class FuseMount(CephFSMount):
         assert not self.is_mounted()
         self._fuse_conn = None
 
-    def umount_wait(self, force=False, require_clean=False):
+    def umount_wait(self, force=False, require_clean=False, timeout=900):
         """
         :param force: Complete cleanly even if the MDS is offline
         """
@@ -282,7 +282,7 @@ class FuseMount(CephFSMount):
         try:
             if self.fuse_daemon:
                 # Permit a timeout, so that we do not block forever
-                run.wait([self.fuse_daemon], 900)
+                run.wait([self.fuse_daemon], timeout)
         except MaxWhileTries:
             log.error("process failed to terminate after unmount.  This probably"
                       "indicates a bug within ceph-fuse.")