diff options
Diffstat (limited to 'qa/tasks/mgr/mgr_test_case.py')
-rw-r--r-- | qa/tasks/mgr/mgr_test_case.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/qa/tasks/mgr/mgr_test_case.py b/qa/tasks/mgr/mgr_test_case.py index 94a230c8d..aa5bc6e56 100644 --- a/qa/tasks/mgr/mgr_test_case.py +++ b/qa/tasks/mgr/mgr_test_case.py @@ -29,8 +29,11 @@ class MgrCluster(CephCluster): def mgr_stop(self, mgr_id): self.mgr_daemons[mgr_id].stop() - def mgr_fail(self, mgr_id): - self.mon_manager.raw_cluster_cmd("mgr", "fail", mgr_id) + def mgr_fail(self, mgr_id=None): + if mgr_id is None: + self.mon_manager.raw_cluster_cmd("mgr", "fail") + else: + self.mon_manager.raw_cluster_cmd("mgr", "fail", mgr_id) def mgr_restart(self, mgr_id): self.mgr_daemons[mgr_id].restart() @@ -77,6 +80,8 @@ class MgrTestCase(CephTestCase): for daemon in cls.mgr_cluster.mgr_daemons.values(): daemon.stop() + cls.mgr_cluster.mon_manager.raw_cluster_cmd("mgr", "set", "down", "false") + for mgr_id in cls.mgr_cluster.mgr_ids: cls.mgr_cluster.mgr_fail(mgr_id) @@ -112,7 +117,11 @@ class MgrTestCase(CephTestCase): raise SkipTest( "Only have {0} manager daemons, {1} are required".format( len(cls.mgr_cluster.mgr_ids), cls.MGRS_REQUIRED)) - + + # We expect laggy OSDs in this testing environment so turn off this warning. + # See https://tracker.ceph.com/issues/61907 + cls.mgr_cluster.mon_manager.raw_cluster_cmd('config', 'set', 'mds', + 'defer_client_eviction_on_laggy_osds', 'false') cls.setup_mgrs() @classmethod |