From cb8081ce7f4e0897cb2047d409ac2865afb3227c Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Mon, 12 Oct 2020 10:13:43 +0800 Subject: [PATCH] qa/cephfs: move the cephfs's opertions setting to create() Fixes: https://tracker.ceph.com/issues/47565 Signed-off-by: Xiubo Li --- qa/tasks/ceph.py | 9 ++------- qa/tasks/cephfs/filesystem.py | 8 +++++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index fc35ce4ce03..100cfd7646b 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -428,13 +428,8 @@ def cephfs_setup(ctx, config): if mdss.remotes: log.info('Setting up CephFS filesystem...') - fs = Filesystem(ctx, name='cephfs', create=True, - ec_profile=config.get('cephfs_ec_profile', None)) - - cephfs_conf = config['cephfs'] - max_mds = config_conf.get('max_mds', 1) - if max_mds > 1: - fs.set_max_mds(max_mds) + Filesystem(ctx, fs_config=config.get('cephfs', None), name='cephfs', + create=True, ec_profile=config.get('cephfs_ec_profile', None)) yield diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py index bb91c75a9cb..89549b39973 100644 --- a/qa/tasks/cephfs/filesystem.py +++ b/qa/tasks/cephfs/filesystem.py @@ -452,7 +452,7 @@ class Filesystem(MDSCluster): This object is for driving a CephFS filesystem. The MDS daemons driven by MDSCluster may be shared with other Filesystems. """ - def __init__(self, ctx, fscid=None, name=None, create=False, + def __init__(self, ctx, fs_config=None, fscid=None, name=None, create=False, ec_profile=None): super(Filesystem, self).__init__(ctx) @@ -463,6 +463,7 @@ class Filesystem(MDSCluster): self.metadata_overlay = False self.data_pool_name = None self.data_pools = None + self.fs_config = fs_config client_list = list(misc.all_roles_of_type(self._ctx.cluster, 'client')) self.client_id = client_list[0] @@ -632,6 +633,11 @@ class Filesystem(MDSCluster): else: raise + if self.fs_config is not None: + max_mds = self.fs_config.get('max_mds', 1) + if max_mds > 1: + self.set_max_mds(max_mds) + self.getinfo(refresh = True) def destroy(self, reset_obj_attrs=True):