From 361ee535ddf7258ea64d94f62dfb035b40a3ffe1 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Wed, 28 Jul 2021 09:44:07 +0800 Subject: [PATCH] qa: multifs already enabled as default Since pacific already mark multifs enabled as defaut. Signed-off-by: Xiubo Li --- qa/tasks/ceph.py | 4 ---- qa/tasks/cephfs/test_failover.py | 4 ---- qa/tasks/cephfs/test_multifs_auth.py | 2 -- 3 files changed, 10 deletions(-) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 9894addd7f1..a07c984a91c 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -415,7 +415,6 @@ def cephfs_setup(ctx, config): log.info('Setting up CephFS filesystem(s)...') cephfs_config = config.get('cephfs', {}) fs_configs = cephfs_config.pop('fs', [{'name': 'cephfs'}]) - set_allow_multifs = len(fs_configs) > 1 # wait for standbys to become available (slow due to valgrind, perhaps) mdsc = MDSCluster(ctx) @@ -432,9 +431,6 @@ def cephfs_setup(ctx, config): temp = deepcopy(cephfs_config) teuthology.deep_merge(temp, fs_config) fs = Filesystem(ctx, fs_config=temp, name=name, create=True) - if set_allow_multifs: - fs.set_allow_multifs() - set_allow_multifs = False fss.append(fs) yield diff --git a/qa/tasks/cephfs/test_failover.py b/qa/tasks/cephfs/test_failover.py index 304d27c2c8c..3df44d3da33 100644 --- a/qa/tasks/cephfs/test_failover.py +++ b/qa/tasks/cephfs/test_failover.py @@ -103,8 +103,6 @@ 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() active = self.fs.get_active_names(status=status)[0] @@ -129,8 +127,6 @@ 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: self._change_target_state(target, mds, {'join_fscid': fs2.id}) diff --git a/qa/tasks/cephfs/test_multifs_auth.py b/qa/tasks/cephfs/test_multifs_auth.py index f4c9b9e8707..2b28c61ca04 100644 --- a/qa/tasks/cephfs/test_multifs_auth.py +++ b/qa/tasks/cephfs/test_multifs_auth.py @@ -29,8 +29,6 @@ class TestMultiFS(CapsHelper): self.run_cluster_cmd(f'auth rm {self.client_name}') self.fs1 = self.fs - # 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 -- 2.39.5