From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 21 Sep 2021 00:07:42 +0000 (-0400)
Subject: qa: fix promotion test
X-Git-Tag: v16.2.14~128^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96ad378355e1570a4b503df22de82c5bd613d83e;p=ceph.git

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 <pdonnell@redhat.com>
(cherry picked from commit b56623342e76aa956c37c6a27b21983ff681fe66)
---

diff --git a/qa/tasks/cephfs/test_failover.py b/qa/tasks/cephfs/test_failover.py
index 3d7637112b8b..bc1657b09684 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)