From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 11 Mar 2019 16:10:57 +0000 (-0700)
Subject: qa: unmount clients prior to marking fs down
X-Git-Tag: v13.2.7~58^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5228ef985c75e75520d731b0f87eba52ed7246c8;p=ceph.git

qa: unmount clients prior to marking fs down

Evicted RHEL7.5 clients may hang.

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

Conflicts:
	qa/tasks/cephfs/test_failover.py
- mimic has a different set of tests: adapt
---

diff --git a/qa/tasks/cephfs/test_failover.py b/qa/tasks/cephfs/test_failover.py
index 48a432705838..dd521167418b 100644
--- a/qa/tasks/cephfs/test_failover.py
+++ b/qa/tasks/cephfs/test_failover.py
@@ -95,6 +95,8 @@ class TestClusterResize(CephFSTestCase):
         That marking a FS down twice does not wipe old_max_mds.
         """
 
+        self.mount_a.umount_wait()
+
         self.grow(2)
         self.fs.set_down()
         self.wait_for_health("MDS_ALL_DOWN", 30)
@@ -109,6 +111,8 @@ class TestClusterResize(CephFSTestCase):
         when actives come back online.
         """
 
+        self.mount_a.umount_wait()
+
         self.fs.set_down()
         self.wait_for_health("MDS_ALL_DOWN", 30)
         self.fs.set_down(False)