From a14d2bab256f7aa5fa52472cfc0ab28c484db235 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Fri, 13 Apr 2018 06:11:30 +0000 Subject: [PATCH] qa/tasks: allow custom timeout for umount_wait() Signed-off-by: Rishabh Dave (cherry picked from commit 18a9d0c49175c9aacfaec15d28125c8fb2a77b51) --- qa/tasks/cephfs/fuse_mount.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py index 8d8410c69edce..6c14ecd227ed2 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.") -- 2.39.5