From: Rishabh Dave <ridave@redhat.com>
Date: Fri, 13 Apr 2018 06:11:30 +0000 (+0000)
Subject: qa/tasks: allow custom timeout for umount_wait()
X-Git-Tag: v12.2.6~76^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a14d2bab256f7aa5fa52472cfc0ab28c484db235;p=ceph.git

qa/tasks: allow custom timeout for umount_wait()

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 18a9d0c49175c9aacfaec15d28125c8fb2a77b51)
---

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index 8d8410c69edc..6c14ecd227ed 100644
--- a/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@ -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.")