From 4fd0202fdf0410d788402f6eefda44b79cf0a643 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Wed, 5 Jun 2019 22:04:22 +0800 Subject: [PATCH] qa/cephfs: fix test_evict_client explictly kill stale session, otherwise session count check is racy. Fixes: https://tracker.ceph.com/issues/40173 Signed-off-by: "Yan, Zheng" --- qa/tasks/cephfs/test_misc.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qa/tasks/cephfs/test_misc.py b/qa/tasks/cephfs/test_misc.py index 9cd3469b88c3..26a551e2d6cc 100644 --- a/qa/tasks/cephfs/test_misc.py +++ b/qa/tasks/cephfs/test_misc.py @@ -122,6 +122,7 @@ class TestMisc(CephFSTestCase): ls_data = self.fs.mds_asok(['session', 'ls']) self.assert_session_count(1, ls_data) + mount_a_client_id = self.mount_a.get_global_id() self.mount_a.kill() self.mount_a.kill_cleanup() @@ -129,6 +130,8 @@ class TestMisc(CephFSTestCase): ls_data = self.fs.mds_asok(['session', 'ls']) self.assert_session_count(1, ls_data) + self.fs.mds_asok(['session', 'evict', "%s" % mount_a_client_id]) + self.mount_a.mount() self.mount_a.wait_until_mounted() self.mount_b.mount() -- 2.47.3