From: John Spray <john.spray@redhat.com>
Date: Wed, 7 Dec 2016 13:39:20 +0000 (+0000)
Subject: tasks/cephfs: use kill in test_reconnect_eviction
X-Git-Tag: v11.1.1~58^2^2~4^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a5a2b3f4a88c75fc372631376a33186044de03d;p=ceph.git

tasks/cephfs: use kill in test_reconnect_eviction

Previously relied on client being able to unmount
while the MDS was offline, which is not necessarily
so.  Use kill instead.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/tasks/cephfs/test_client_recovery.py b/tasks/cephfs/test_client_recovery.py
index 8839345e9607..4b4085a91570 100644
--- a/tasks/cephfs/test_client_recovery.py
+++ b/tasks/cephfs/test_client_recovery.py
@@ -176,11 +176,13 @@ class TestClientRecovery(CephFSTestCase):
     def test_reconnect_eviction(self):
         # Eviction during reconnect
         # =========================
+        mount_a_client_id = self.mount_a.get_global_id()
+
         self.fs.mds_stop()
         self.fs.mds_fail()
 
-        mount_a_client_id = self.mount_a.get_global_id()
-        self.mount_a.umount_wait(force=True)
+        # The mount goes away while the MDS is offline
+        self.mount_a.kill()
 
         self.fs.mds_restart()
 
@@ -201,6 +203,9 @@ class TestClientRecovery(CephFSTestCase):
                             evict_til_active
                         ))
 
+        # We killed earlier so must clean up before trying to use again
+        self.mount_a.kill_cleanup()
+
         # Bring the client back
         self.mount_a.mount()
         self.mount_a.wait_until_mounted()