import ceph 16.2.6

[ceph.git] / ceph / qa / tasks / mds_pre_upgrade.py

diff --git a/ceph/qa/tasks/mds_pre_upgrade.py b/ceph/qa/tasks/mds_pre_upgrade.py
index 0856d48337c436c20d03311161727a4a552f16cc..812d402edee454b51ef1855850969d2705b24b04 100644 (file)
--- a/ceph/qa/tasks/mds_pre_upgrade.py
+++ b/ceph/qa/tasks/mds_pre_upgrade.py
@@ -3,7 +3,6 @@ Prepare MDS cluster for upgrade.
 """
 
 import logging
-import time
 
 from tasks.cephfs.filesystem import Filesystem
 
@@ -22,22 +21,7 @@ def task(ctx, config):
         'snap-upgrade task only accepts a dict for configuration'
 
     fs = Filesystem(ctx)
-    status = fs.getinfo()
-
+    fs.getinfo() # load name
+    fs.set_allow_standby_replay(False)
     fs.set_max_mds(1)
     fs.reach_max_mds()
-
-    # Stop standbys now to minimize time rank 0 is down in subsequent:
-    # tasks:
-    # - ceph.stop: [mds.*]
-    rank0 = fs.get_rank(rank=0, status=status)
-    for daemon in ctx.daemons.iter_daemons_of_role('mds', fs.mon_manager.cluster):
-        if rank0['name'] != daemon.id_:
-            daemon.stop()
-
-    for i in range(1, 10):
-        time.sleep(5) # time for FSMap to update
-        status = fs.getinfo()
-        if len(list(status.get_standbys())) == 0:
-            break
-    assert(len(list(status.get_standbys())) == 0)