From: John Spray <john.spray@redhat.com>
Date: Tue, 16 May 2017 12:52:59 +0000 (-0400)
Subject: qa: no longer need to explicitly enable multimds
X-Git-Tag: ses5-milestone7~3^2~7^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6cfa354589b254b456b7db0c3947151816494ab;p=ceph.git

qa: no longer need to explicitly enable multimds

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index fa43530a6f5c..5363697168d8 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -346,7 +346,6 @@ def cephfs_setup(ctx, config):
         all_roles = [item for remote_roles in mdss.remotes.values() for item in remote_roles]
         num_active = len([r for r in all_roles if is_active_mds(r)])
 
-        fs.set_allow_multimds(True)
         fs.set_max_mds(num_active)
         fs.set_allow_dirfrags(True)
 
diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py
index 01e1ca588c1e..0d3fc547b7e2 100644
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@ -425,9 +425,6 @@ class Filesystem(MDSCluster):
     def set_allow_dirfrags(self, yes):
         self.mon_manager.raw_cluster_cmd("fs", "set", self.name, "allow_dirfrags", str(yes).lower(), '--yes-i-really-mean-it')
 
-    def set_allow_multimds(self, yes):
-        self.mon_manager.raw_cluster_cmd("fs", "set", self.name, "allow_multimds", str(yes).lower(), '--yes-i-really-mean-it')
-
     def get_pgs_per_fs_pool(self):
         """
         Calculate how many PGs to use when creating a pool, in order to avoid raising any
diff --git a/qa/tasks/cephfs/test_exports.py b/qa/tasks/cephfs/test_exports.py
index 80f876ebca30..df16e1939734 100644
--- a/qa/tasks/cephfs/test_exports.py
+++ b/qa/tasks/cephfs/test_exports.py
@@ -23,7 +23,6 @@ class TestExports(CephFSTestCase):
         raise RuntimeError("rank {0} failed to reach desired subtree state", rank)
 
     def test_export_pin(self):
-        self.fs.set_allow_multimds(True)
         self.fs.set_max_mds(2)
 
         status = self.fs.status()
diff --git a/qa/tasks/cephfs/test_failover.py b/qa/tasks/cephfs/test_failover.py
index faefec458d61..1bb2ff7322b3 100644
--- a/qa/tasks/cephfs/test_failover.py
+++ b/qa/tasks/cephfs/test_failover.py
@@ -257,7 +257,6 @@ class TestStandbyReplay(CephFSTestCase):
 
         # Create FS alpha and get mds_a to come up as active
         fs_a = self.mds_cluster.newfs("alpha")
-        fs_a.set_allow_multimds(True)
         fs_a.set_max_mds(2)
 
         self.mds_cluster.mds_restart(mds_a)
@@ -412,8 +411,6 @@ class TestMultiFilesystems(CephFSTestCase):
     def test_grow_shrink(self):
         # Usual setup...
         fs_a, fs_b = self._setup_two()
-        fs_a.set_allow_multimds(True)
-        fs_b.set_allow_multimds(True)
 
         # Increase max_mds on fs_b, see a standby take up the role
         fs_b.set_max_mds(2)
@@ -570,10 +567,8 @@ class TestMultiFilesystems(CephFSTestCase):
 
         # Create two filesystems which should have two ranks each
         fs_a = self.mds_cluster.newfs("alpha")
-        fs_a.set_allow_multimds(True)
 
         fs_b = self.mds_cluster.newfs("bravo")
-        fs_b.set_allow_multimds(True)
 
         fs_a.set_max_mds(2)
         fs_b.set_max_mds(2)
diff --git a/qa/tasks/cephfs/test_journal_repair.py b/qa/tasks/cephfs/test_journal_repair.py
index 1b03afc0fc49..62cbbb0684a7 100644
--- a/qa/tasks/cephfs/test_journal_repair.py
+++ b/qa/tasks/cephfs/test_journal_repair.py
@@ -160,7 +160,6 @@ class TestJournalRepair(CephFSTestCase):
         """
 
         # Set max_mds to 2
-        self.fs.set_allow_multimds(True)
         self.fs.set_max_mds(2)
 
         # See that we have two active MDSs
diff --git a/qa/tasks/cephfs/test_mantle.py b/qa/tasks/cephfs/test_mantle.py
index 8e0526332e65..6cd86ad12dcf 100644
--- a/qa/tasks/cephfs/test_mantle.py
+++ b/qa/tasks/cephfs/test_mantle.py
@@ -9,7 +9,6 @@ success = "mantle balancer version changed: "
 class TestMantle(CephFSTestCase):
     def start_mantle(self):
         self.wait_for_health_clear(timeout=30)
-        self.fs.set_allow_multimds(True)
         self.fs.set_max_mds(2)
         self.wait_until_equal(lambda: len(self.fs.get_active_names()), 2, 30,
                               reject_fn=lambda v: v > 2 or v < 1)
diff --git a/qa/tasks/cephfs/test_sessionmap.py b/qa/tasks/cephfs/test_sessionmap.py
index e9b4b646d8f1..9d12ab6d8bee 100644
--- a/qa/tasks/cephfs/test_sessionmap.py
+++ b/qa/tasks/cephfs/test_sessionmap.py
@@ -99,7 +99,6 @@ class TestSessionMap(CephFSTestCase):
         self.fs.wait_for_daemons()
 
         # I would like two MDSs, so that I can do an export dir later
-        self.fs.set_allow_multimds(True)
         self.fs.set_max_mds(2)
         self.fs.wait_for_daemons()
 
diff --git a/qa/tasks/cephfs/test_strays.py b/qa/tasks/cephfs/test_strays.py
index 3335d89dd900..6e70243a36b9 100644
--- a/qa/tasks/cephfs/test_strays.py
+++ b/qa/tasks/cephfs/test_strays.py
@@ -492,7 +492,6 @@ class TestStrays(CephFSTestCase):
 
     def _setup_two_ranks(self):
         # Set up two MDSs
-        self.fs.set_allow_multimds(True)
         self.fs.set_max_mds(2)
 
         # See that we have two active MDSs