From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 30 Sep 2018 00:34:37 +0000 (-0700)
Subject: qa: add timeout to kclient umount
X-Git-Tag: v13.2.3~106^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fed01a30d19dfafcb5ffad95e24d207f5e96cf1;p=ceph.git

qa: add timeout to kclient umount

Otherwise QA sits forever waiting for the kclient to umount when there is a
problem.

Fixes: http://tracker.ceph.com/issues/36184
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 7a64eb9dfb908a1a8e5d2b0dcaa7ca9df52a9ab1)
---

diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py
index 3f10657b8558..fe6584c7bbe7 100644
--- a/qa/tasks/cephfs/kernel_mount.py
+++ b/qa/tasks/cephfs/kernel_mount.py
@@ -101,7 +101,7 @@ class KernelMount(CephFSMount):
             cmd.append('-f')
 
         try:
-            self.client_remote.run(args=cmd)
+            self.client_remote.run(args=cmd, timeout=(5*60))
         except Exception as e:
             self.client_remote.run(args=[
                 'sudo',