From: John Spray Date: Tue, 29 Mar 2016 11:11:18 +0000 (+0100) Subject: tasks/cephfs: update failover test for standby changes X-Git-Tag: v11.1.1~58^2^2~204^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d9309b57e3c12579f64939ee78161f7e99a062c8;p=ceph.git tasks/cephfs: update failover test for standby changes Previously, an MDS could be used as a replay even if it had "standby replay = false", this is changed now so that replays will only happen explicitly. Signed-off-by: John Spray --- diff --git a/tasks/cephfs/test_failover.py b/tasks/cephfs/test_failover.py index 6fa209cf6b2..5183beb95f7 100644 --- a/tasks/cephfs/test_failover.py +++ b/tasks/cephfs/test_failover.py @@ -365,17 +365,8 @@ class TestMultiFilesystems(CephFSTestCase): self.mds_cluster.mds_restart(mds_c) self.wait_for_daemon_start([mds_a, mds_c]) - # See that they take up standby replay roles - # mds_a should be in filesystem alpha following mds_b - info_a = get_info_by_name(fs_a, mds_a) - self.assertEqual(info_a['state'], "up:standby-replay") - self.assertEqual(info_a['standby_for_name'], mds_b) - self.assertEqual(info_a['rank'], 0) - # mds_c should be in filesystem alpha following mds_d - info_c = get_info_by_name(fs_b, mds_c) - self.assertEqual(info_c['state'], "up:standby-replay") - self.assertEqual(info_c['standby_for_name'], mds_d) - self.assertEqual(info_c['rank'], 0) + self.assertEqual(set(self.mds_cluster.get_standby_daemons()), + {mds_a, mds_c}) def test_standby_for_rank(self): use_daemons = sorted(self.mds_cluster.mds_ids[0:4])