From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 9 Dec 2020 02:38:15 +0000 (-0800)
Subject: qa: update tests concerning setting of multifs
X-Git-Tag: v16.1.0~206^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4bd9ef09652692267b3069fb3337a7da89872717;p=ceph.git

qa: update tests concerning setting of multifs

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/tasks/cephfs/cephfs_test_case.py b/qa/tasks/cephfs/cephfs_test_case.py
index 3905c0293494..3c5a23d3ce73 100644
--- a/qa/tasks/cephfs/cephfs_test_case.py
+++ b/qa/tasks/cephfs/cephfs_test_case.py
@@ -175,6 +175,7 @@ class CephFSTestCase(CephTestCase):
         if self.REQUIRE_RECOVERY_FILESYSTEM:
             if not self.REQUIRE_FILESYSTEM:
                 self.skipTest("Recovery filesystem requires a primary filesystem as well")
+            # After Octopus is EOL, we can remove this setting:
             self.fs.mon_manager.raw_cluster_cmd('fs', 'flag', 'set',
                                                 'enable_multiple', 'true',
                                                 '--yes-i-really-mean-it')
diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py
index 9705dbe3cf7d..e3e2f5b6e6bb 100644
--- a/qa/tasks/cephfs/filesystem.py
+++ b/qa/tasks/cephfs/filesystem.py
@@ -1506,10 +1506,6 @@ class Filesystem(MDSCluster):
     def is_full(self):
         return self.is_pool_full(self.get_data_pool_name())
 
-    def enable_multifs(self):
-        self.mon_manager.raw_cluster_cmd('fs', 'flag', 'set',
-            'enable_multiple', 'true', '--yes-i-really-mean-it')
-
     def authorize(self, client_id, caps=('/', 'rw')):
         """
         Run "ceph fs authorize" and run "ceph auth get" to get and returnt the
diff --git a/qa/tasks/cephfs/test_failover.py b/qa/tasks/cephfs/test_failover.py
index 3712e5c10f6d..42e2e1417c49 100644
--- a/qa/tasks/cephfs/test_failover.py
+++ b/qa/tasks/cephfs/test_failover.py
@@ -103,6 +103,7 @@ class TestClusterAffinity(CephFSTestCase):
         """
         That a vanilla standby is preferred over others with mds_join_fs set to another fs.
         """
+        # After Octopus is EOL, we can remove this setting:
         self.fs.set_allow_multifs()
         fs2 = self.mds_cluster.newfs(name="cephfs2")
         status, target = self._verify_init()
@@ -128,6 +129,7 @@ class TestClusterAffinity(CephFSTestCase):
         standbys = [info['name'] for info in status.get_standbys()]
         for mds in standbys:
             self.config_set('mds.'+mds, 'mds_join_fs', 'cephfs2')
+        # After Octopus is EOL, we can remove this setting:
         self.fs.set_allow_multifs()
         fs2 = self.mds_cluster.newfs(name="cephfs2")
         for mds in standbys:
diff --git a/qa/tasks/cephfs/test_multifs_auth.py b/qa/tasks/cephfs/test_multifs_auth.py
index 2f21cf654d2f..b247dd8f51bc 100644
--- a/qa/tasks/cephfs/test_multifs_auth.py
+++ b/qa/tasks/cephfs/test_multifs_auth.py
@@ -29,7 +29,8 @@ class TestMultiFS(CapsHelper):
         self.run_cluster_cmd(f'auth rm {self.client_name}')
 
         self.fs1 = self.fs
-        self.fs1.enable_multifs()
+        # After Octopus is EOL, we can remove this setting:
+        self.fs1.set_allow_multifs()
         self.fs2 = self.mds_cluster.newfs(name='cephfs2', create=True)
 
         # we'll reassign caps to client.1 so that it can operate with cephfs2