From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 12 Apr 2016 04:46:12 +0000 (-0700)
Subject: FIXUP 'cephfs: update tests to enable multimds when needed'
X-Git-Tag: v10.2.6~165^2^2~103^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a739533cd1cc57098de61f70248990d122ecc8aa;p=ceph.git

FIXUP 'cephfs: update tests to enable multimds when needed'
---

diff --git a/tasks/cephfs/test_failover.py b/tasks/cephfs/test_failover.py
index e7e7e6a7ac80..6fa209cf6b2f 100644
--- a/tasks/cephfs/test_failover.py
+++ b/tasks/cephfs/test_failover.py
@@ -162,9 +162,6 @@ class TestMultiFilesystems(CephFSTestCase):
         self.fs.mon_manager.raw_cluster_cmd("fs", "flag", "set",
                                             "enable_multiple", "true",
                                             "--yes-i-really-mean-it")
-        self.fs.mon_manager.raw_cluster_cmd("mds", "set",
-                                            "allow_multimds", "true",
-                                            "--yes-i-really-mean-it")
 
     def _setup_two(self):
         fs_a = self.mds_cluster.get_filesystem("alpha")
@@ -265,6 +262,13 @@ class TestMultiFilesystems(CephFSTestCase):
     def test_grow_shrink(self):
         # Usual setup...
         fs_a, fs_b = self._setup_two()
+        fs_a.mon_manager.raw_cluster_cmd("fs", "set", fs_a.name,
+                                         "allow_multimds", "true",
+                                         "--yes-i-really-mean-it")
+
+        fs_b.mon_manager.raw_cluster_cmd("fs", "set", fs_b.name,
+                                         "allow_multimds", "true",
+                                         "--yes-i-really-mean-it")
 
         # Increase max_mds on fs_b, see a standby take up the role
         fs_b.mon_manager.raw_cluster_cmd('fs', 'set', fs_b.name, 'max_mds', "2")
@@ -435,8 +439,16 @@ class TestMultiFilesystems(CephFSTestCase):
         # Create two filesystems which should have two ranks each
         fs_a = self.mds_cluster.get_filesystem("alpha")
         fs_a.create()
+        fs_a.mon_manager.raw_cluster_cmd("fs", "set", fs_a.name,
+                                         "allow_multimds", "true",
+                                         "--yes-i-really-mean-it")
+
         fs_b = self.mds_cluster.get_filesystem("bravo")
         fs_b.create()
+        fs_b.mon_manager.raw_cluster_cmd("fs", "set", fs_b.name,
+                                         "allow_multimds", "true",
+                                         "--yes-i-really-mean-it")
+
         fs_a.mon_manager.raw_cluster_cmd('fs', 'set', fs_a.name,
                                          'max_mds', "2")
         fs_b.mon_manager.raw_cluster_cmd('fs', 'set', fs_b.name,