qa/cephfs: add 'cephfs:' section support

Fixes: https://tracker.ceph.com/issues/47565
Signed-off-by: Xiubo Li <xiubli@redhat.com>

diff --git a/qa/cephfs/clusters/3-mds.yaml b/qa/cephfs/clusters/3-mds.yaml
index ab517757033edd7ed87ec242ad9b718b5539c5bf..edfec5e19a375e4fe791370509ebc4f8191d7e84 100644 (file)
--- a/qa/cephfs/clusters/3-mds.yaml
+++ b/qa/cephfs/clusters/3-mds.yaml
@@ -4,7 +4,8 @@ roles:
 - [client.0, client.1]
 overrides:
   ceph:
-    max_mds: 3
+    cephfs:
+      max_mds: 3
 openstack:
 - volumes: # attached to each instance
     count: 4

diff --git a/qa/cephfs/clusters/9-mds.yaml b/qa/cephfs/clusters/9-mds.yaml
index 302b1ac786ef4fd71f6f4af3750f03c5af20eddd..fd69e32bcea70c0cf3632638886cd22fa63e0217 100644 (file)
--- a/qa/cephfs/clusters/9-mds.yaml
+++ b/qa/cephfs/clusters/9-mds.yaml
@@ -4,7 +4,8 @@ roles:
 - [client.0, client.1]
 overrides:
   ceph:
-    max_mds: 9
+    cephfs:
+      max_mds: 9
 openstack:
 - volumes: # attached to each instance
     count: 4

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/overrides/multimds/no.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/overrides/multimds/no.yaml
index c740a450a6f2752694cd29308fe4e9b85e04ece1..f9e95daa9230b01f9d19e5665425205b9594da58 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/old_client/overrides/multimds/no.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/overrides/multimds/no.yaml
@@ -1,3 +1,4 @@
 overrides:
   ceph:
-    max_mds: 1
+    cephfs:
+      max_mds: 1

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/overrides/multimds/yes.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/overrides/multimds/yes.yaml
index ecf118d9f86762733f16a70ed367050c9ae20175..b3a9b5d6714f0c07d43802b810388fe157d752b4 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/old_client/overrides/multimds/yes.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/overrides/multimds/yes.yaml
@@ -1,3 +1,4 @@
 overrides:
   ceph:
-    max_mds: 2
+    cephfs:
+      max_mds: 2

diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/multimds/no.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/multimds/no.yaml
index c740a450a6f2752694cd29308fe4e9b85e04ece1..f9e95daa9230b01f9d19e5665425205b9594da58 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/multimds/no.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/multimds/no.yaml
@@ -1,3 +1,4 @@
 overrides:
   ceph:
-    max_mds: 1
+    cephfs:
+      max_mds: 1

diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/multimds/yes.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/multimds/yes.yaml
index ecf118d9f86762733f16a70ed367050c9ae20175..b3a9b5d6714f0c07d43802b810388fe157d752b4 100644 (file)
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/multimds/yes.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/overrides/multimds/yes.yaml
@@ -1,3 +1,4 @@
 overrides:
   ceph:
-    max_mds: 2
+    cephfs:
+      max_mds: 2

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 798fe7c50f2ef8226a13de815737d8f8630e79ff..fc35ce4ce03011509c708332e90366dafb05e120 100644 (file)
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -431,7 +431,8 @@ def cephfs_setup(ctx, config):
         fs = Filesystem(ctx, name='cephfs', create=True,
                         ec_profile=config.get('cephfs_ec_profile', None))
 
-        max_mds = config.get('max_mds', 1)
+        cephfs_conf = config['cephfs']
+        max_mds = config_conf.get('max_mds', 1)
         if max_mds > 1:
             fs.set_max_mds(max_mds)
 
@@ -1720,6 +1721,13 @@ def task(ctx, config):
             mkfs_options: [-b,size=65536,-l,logdev=/dev/sdc1]
             mount_options: [nobarrier, inode64]
 
+    To change the cephfs's default max_mds (1), use::
+
+        tasks:
+        - ceph:
+            cephfs:
+              max_mds: 2
+
     Note, this will cause the task to check the /scratch_devs file on each node
     for available devices.  If no such file is found, /dev/sdb will be used.