From 96ad378355e1570a4b503df22de82c5bd613d83e Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 20 Sep 2021 20:07:42 -0400 Subject: [PATCH] qa: fix promotion test The test is not needing to check that the new MDS becomes active, only that a replacement occurs. Fixes: https://tracker.ceph.com/issues/52677 Signed-off-by: Patrick Donnelly (cherry picked from commit b56623342e76aa956c37c6a27b21983ff681fe66) --- qa/tasks/cephfs/test_failover.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/qa/tasks/cephfs/test_failover.py b/qa/tasks/cephfs/test_failover.py index 3d7637112b8..bc1657b0968 100644 --- a/qa/tasks/cephfs/test_failover.py +++ b/qa/tasks/cephfs/test_failover.py @@ -310,9 +310,6 @@ class TestFailover(CephFSTestCase): in thrashing tests. """ - # Need all my standbys up as well as the active daemons - self.wait_for_daemon_start() - (original_active, ) = self.fs.get_active_names() original_standbys = self.mds_cluster.get_standby_daemons() @@ -321,12 +318,12 @@ class TestFailover(CephFSTestCase): # Wait until the monitor promotes his replacement def promoted(): - active = self.fs.get_active_names() - return active and active[0] in original_standbys + ranks = list(self.fs.get_ranks()) + return len(ranks) > 0 and ranks[0]['name'] in original_standbys log.info("Waiting for promotion of one of the original standbys {0}".format( original_standbys)) - self.wait_until_true(promoted, timeout=self.fs.beacon_timeout) + self.wait_until_true(promoted, timeout=self.fs.beacon_timeout*2) # Start the original rank 0 daemon up again, see that he becomes a standby self.fs.mds_restart(original_active) -- 2.47.3