From 5228ef985c75e75520d731b0f87eba52ed7246c8 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 11 Mar 2019 09:10:57 -0700 Subject: [PATCH] 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 (cherry picked from commit 9aaf6118a4f259c9450af75d7b879ae2616bf77c) Conflicts: qa/tasks/cephfs/test_failover.py - mimic has a different set of tests: adapt --- qa/tasks/cephfs/test_failover.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qa/tasks/cephfs/test_failover.py b/qa/tasks/cephfs/test_failover.py index 48a4327058388..dd521167418b7 100644 --- a/qa/tasks/cephfs/test_failover.py +++ b/qa/tasks/cephfs/test_failover.py @@ -95,6 +95,8 @@ def test_down_twice(self): 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 @@ def test_all_down(self): 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)