From 488f10c62ffd7fcc9a5ebe417be2b1c60f4720a7 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 23 Dec 2020 15:44:57 -0800 Subject: [PATCH] qa: move cephfs_ec_profile under cephfs Signed-off-by: Patrick Donnelly --- qa/cephfs/objectstore-ec/bluestore-comp-ec-root.yaml | 9 +++++---- qa/cephfs/objectstore-ec/bluestore-ec-root.yaml | 9 +++++---- qa/suites/fs/functional/tasks/mds-full.yaml | 5 +++-- qa/tasks/cephfs/filesystem.py | 2 +- qa/tasks/vstart_runner.py | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/qa/cephfs/objectstore-ec/bluestore-comp-ec-root.yaml b/qa/cephfs/objectstore-ec/bluestore-comp-ec-root.yaml index 9bc487cfc120e..512eb117c3f1c 100644 --- a/qa/cephfs/objectstore-ec/bluestore-comp-ec-root.yaml +++ b/qa/cephfs/objectstore-ec/bluestore-comp-ec-root.yaml @@ -4,10 +4,11 @@ overrides: bdev_inject_crash_probability: .5 ceph: fs: xfs - cephfs_ec_profile: - - m=2 - - k=2 - - crush-failure-domain=osd + cephfs: + ec_profile: + - m=2 + - k=2 + - crush-failure-domain=osd conf: osd: osd objectstore: bluestore diff --git a/qa/cephfs/objectstore-ec/bluestore-ec-root.yaml b/qa/cephfs/objectstore-ec/bluestore-ec-root.yaml index 726ad3d5615b8..b89c4c71125ce 100644 --- a/qa/cephfs/objectstore-ec/bluestore-ec-root.yaml +++ b/qa/cephfs/objectstore-ec/bluestore-ec-root.yaml @@ -4,10 +4,11 @@ overrides: bdev_inject_crash_probability: .5 ceph: fs: xfs - cephfs_ec_profile: - - m=2 - - k=2 - - crush-failure-domain=osd + cephfs: + ec_profile: + - m=2 + - k=2 + - crush-failure-domain=osd conf: osd: osd objectstore: bluestore diff --git a/qa/suites/fs/functional/tasks/mds-full.yaml b/qa/suites/fs/functional/tasks/mds-full.yaml index d00dd9bbcc924..0c869287750c9 100644 --- a/qa/suites/fs/functional/tasks/mds-full.yaml +++ b/qa/suites/fs/functional/tasks/mds-full.yaml @@ -1,7 +1,8 @@ overrides: ceph: - cephfs_ec_profile: - - disabled + cephfs: + ec_profile: + - disabled log-ignorelist: - OSD full dropping all updates - OSD near full diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py index 76211c69669c7..fdbca0eaf4a25 100644 --- a/qa/tasks/cephfs/filesystem.py +++ b/qa/tasks/cephfs/filesystem.py @@ -462,7 +462,7 @@ class Filesystem(MDSCluster): self.data_pool_name = None self.data_pools = None self.fs_config = fs_config - self.ec_profile = fs_config.get('cephfs_ec_profile') + self.ec_profile = fs_config.get('ec_profile') client_list = list(misc.all_roles_of_type(self._ctx.cluster, 'client')) self.client_id = client_list[0] diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py index 81fd59283769e..8c7cd32cf56ed 100644 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@ -1181,7 +1181,7 @@ class LocalFilesystem(Filesystem, LocalMDSCluster): self.data_pool_name = None self.data_pools = None self.fs_config = fs_config - self.ec_profile = fs_config.get('cephfs_ec_profile') + self.ec_profile = fs_config.get('ec_profile') # Hack: cheeky inspection of ceph.conf to see what MDSs exist self.mds_ids = set() -- 2.39.5