update sources to v12.1.0

[ceph.git] / ceph / qa / tasks / cephfs / cephfs_test_case.py

diff --git a/ceph/qa/tasks/cephfs/cephfs_test_case.py b/ceph/qa/tasks/cephfs/cephfs_test_case.py
index ce21fab0d25dcdd9bf4c15fbd9b1251bc8fd01c5..72e8e9f03c01202c011c22d79752384683446dec 100644 (file)
--- a/ceph/qa/tasks/cephfs/cephfs_test_case.py
+++ b/ceph/qa/tasks/cephfs/cephfs_test_case.py
@@ -102,6 +102,7 @@ class CephFSTestCase(CephTestCase):
         # To avoid any issues with e.g. unlink bugs, we destroy and recreate
         # the filesystem rather than just doing a rm -rf of files
         self.mds_cluster.mds_stop()
+        self.mds_cluster.mds_fail()
         self.mds_cluster.delete_all_filesystems()
         self.fs = None # is now invalid!
 
@@ -193,8 +194,10 @@ class CephFSTestCase(CephTestCase):
         if ls_data is None:
             ls_data = self.fs.mds_asok(['session', 'ls'], mds_id=mds_id)
 
-        self.assertEqual(expected, len(ls_data), "Expected {0} sessions, found {1}".format(
-            expected, len(ls_data)
+        alive_count = len([s for s in ls_data if s['state'] != 'killing'])
+
+        self.assertEqual(expected, alive_count, "Expected {0} sessions, found {1}".format(
+            expected, alive_count
         ))
 
     def assert_session_state(self, client_id,  expected_state):