Merge PR ceph#42000 into master

* refs/pull/42000/head: qa: update rhel kclient to setup container tools qa: stop overriding distro for k-testing qa: only use RHEL for workload testing qa: convert fs:workload to use cephadm qa: split fs begin task qa/tasks/cephadm: setup CephManager when OSDs are provisioned qa/tasks/cephadm: setup file system if MDS are provisioned Reviewed-by: Sage Weil <sage@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com>
ifed01 · Feb 9, 2022 · e883dc3 · e883dc3
2 parents 1a06950 + 0fcf892
commit e883dc3
Show file tree

Hide file tree

Showing 56 changed files with 103 additions and 39 deletions.
diff --git a/.../mount/kclient/overrides/distro/testing/% → qa/cephfs/begin/+ b/.../mount/kclient/overrides/distro/testing/% → qa/cephfs/begin/+
diff --git a/qa/cephfs/begin.yaml → qa/cephfs/begin/0-install.yaml b/qa/cephfs/begin.yaml → qa/cephfs/begin/0-install.yaml
@@ -1,6 +1,3 @@
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G
 tasks:
   - install:
       extra_packages:
@@ -53,7 +50,6 @@ tasks:
         - libtool
         - libuuid-devel
         - xfsprogs-devel
-  - ceph:
 syslog:
   ignorelist:
     - WARNING*.*check_session_state

diff --git a/qa/cephfs/begin/1-ceph.yaml b/qa/cephfs/begin/1-ceph.yaml
@@ -0,0 +1,5 @@
+log-rotate:
+  ceph-mds: 10G
+  ceph-osd: 10G
+tasks:
+  - ceph:
diff --git a/qa/cephfs/begin/2-logrotate.yaml b/qa/cephfs/begin/2-logrotate.yaml
@@ -0,0 +1,3 @@
+log-rotate:
+  ceph-mds: 10G
+  ceph-osd: 10G
diff --git a/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/.qa b/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/.qa
diff --git a/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/centos_latest.yaml b/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/centos_latest.yaml
diff --git a/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/ubuntu_latest.yaml b/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/ubuntu_latest.yaml
diff --git a/qa/suites/fs/32bits/begin b/qa/suites/fs/32bits/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/32bits/begin.yaml b/qa/suites/fs/32bits/begin.yaml
diff --git a/qa/suites/fs/bugs/client_trim_caps/begin b/qa/suites/fs/bugs/client_trim_caps/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/bugs/client_trim_caps/begin.yaml b/qa/suites/fs/bugs/client_trim_caps/begin.yaml
diff --git a/qa/suites/fs/full/begin b/qa/suites/fs/full/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/full/begin.yaml b/qa/suites/fs/full/begin.yaml
diff --git a/qa/suites/fs/functional/begin b/qa/suites/fs/functional/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/functional/begin.yaml b/qa/suites/fs/functional/begin.yaml
diff --git a/qa/suites/fs/libcephfs/begin b/qa/suites/fs/libcephfs/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/libcephfs/begin.yaml b/qa/suites/fs/libcephfs/begin.yaml
diff --git a/qa/suites/fs/mirror-ha/begin b/qa/suites/fs/mirror-ha/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/mirror-ha/begin.yaml b/qa/suites/fs/mirror-ha/begin.yaml
diff --git a/qa/suites/fs/mirror/begin b/qa/suites/fs/mirror/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/mirror/begin.yaml b/qa/suites/fs/mirror/begin.yaml
diff --git a/qa/suites/fs/mixed-clients/begin b/qa/suites/fs/mixed-clients/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/mixed-clients/begin.yaml b/qa/suites/fs/mixed-clients/begin.yaml
diff --git a/qa/suites/fs/multiclient/begin b/qa/suites/fs/multiclient/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/multiclient/begin.yaml b/qa/suites/fs/multiclient/begin.yaml
diff --git a/qa/suites/fs/multifs/begin b/qa/suites/fs/multifs/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/multifs/begin.yaml b/qa/suites/fs/multifs/begin.yaml
diff --git a/qa/suites/fs/permission/begin b/qa/suites/fs/permission/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/permission/begin.yaml b/qa/suites/fs/permission/begin.yaml
diff --git a/qa/suites/fs/shell/begin b/qa/suites/fs/shell/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/shell/begin.yaml b/qa/suites/fs/shell/begin.yaml
diff --git a/qa/suites/fs/snaps/begin b/qa/suites/fs/snaps/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/snaps/begin.yaml b/qa/suites/fs/snaps/begin.yaml
diff --git a/qa/suites/fs/thrash/multifs/begin b/qa/suites/fs/thrash/multifs/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/thrash/multifs/begin.yaml b/qa/suites/fs/thrash/multifs/begin.yaml
diff --git a/qa/suites/fs/thrash/workloads/begin b/qa/suites/fs/thrash/workloads/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/thrash/workloads/begin.yaml b/qa/suites/fs/thrash/workloads/begin.yaml
diff --git a/qa/suites/fs/top/begin b/qa/suites/fs/top/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/top/begin.yaml b/qa/suites/fs/top/begin.yaml
diff --git a/qa/suites/fs/traceless/begin b/qa/suites/fs/traceless/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/traceless/begin.yaml b/qa/suites/fs/traceless/begin.yaml
diff --git a/qa/suites/fs/valgrind/begin b/qa/suites/fs/valgrind/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/valgrind/begin.yaml b/qa/suites/fs/valgrind/begin.yaml
diff --git a/qa/suites/fs/verify/begin b/qa/suites/fs/verify/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/verify/begin.yaml b/qa/suites/fs/verify/begin.yaml
diff --git a/qa/suites/fs/volumes/begin b/qa/suites/fs/volumes/begin
@@ -0,0 +1 @@
+.qa/cephfs/begin/
diff --git a/qa/suites/fs/volumes/begin.yaml b/qa/suites/fs/volumes/begin.yaml
diff --git a/qa/suites/fs/workload/0-rhel_8.yaml b/qa/suites/fs/workload/0-rhel_8.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml
diff --git a/qa/suites/fs/workload/begin.yaml b/qa/suites/fs/workload/begin.yaml
diff --git a/qa/suites/fs/workload/begin/+ b/qa/suites/fs/workload/begin/+
diff --git a/qa/suites/fs/workload/begin/.qa b/qa/suites/fs/workload/begin/.qa
@@ -0,0 +1 @@
+../.qa
diff --git a/qa/suites/fs/workload/begin/0-install.yaml b/qa/suites/fs/workload/begin/0-install.yaml
@@ -0,0 +1 @@
+.qa/cephfs/begin/0-install.yaml
diff --git a/qa/suites/fs/workload/begin/1-cephadm.yaml b/qa/suites/fs/workload/begin/1-cephadm.yaml
@@ -0,0 +1,21 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
+tasks:
+- cephadm:
+    roleless: false
+- cephadm.shell:
+    mon.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls
+- cephadm.shell:
+    mon.a:
+      - ceph fs dump
+      - ceph osd dump
+- fs.ready:
+    timeout: 300
diff --git a/qa/suites/fs/workload/begin/2-logrotate.yaml b/qa/suites/fs/workload/begin/2-logrotate.yaml
@@ -0,0 +1 @@
+.qa/cephfs/begin/2-logrotate.yaml
diff --git a/qa/suites/fs/workload/distro b/qa/suites/fs/workload/distro
diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
@@ -11,6 +11,7 @@
 import uuid
 import yaml
 
+from copy import deepcopy
 from io import BytesIO, StringIO
 from tarfile import ReadError
 from tasks.ceph_manager import CephManager
@@ -20,6 +21,7 @@
 from teuthology.orchestra.daemon import DaemonGroup
 from teuthology.config import config as teuth_config
 from textwrap import dedent
+from tasks.cephfs.filesystem import MDSCluster, Filesystem
 
 # these items we use from ceph.py should probably eventually move elsewhere
 from tasks.ceph import get_mons, healthy
@@ -811,6 +813,16 @@ def ceph_osds(ctx, config):
                 if int(j.get('num_up_osds', 0)) == num_osds:
                     break;
 
+        if not hasattr(ctx, 'managers'):
+            ctx.managers = {}
+        ctx.managers[cluster_name] = CephManager(
+            ctx.ceph[cluster_name].bootstrap_remote,
+            ctx=ctx,
+            logger=log.getChild('ceph_manager.' + cluster_name),
+            cluster=cluster_name,
+            cephadm=True,
+        )
+
         yield
     finally:
         pass
@@ -852,6 +864,43 @@ def ceph_mdss(ctx, config):
 
     yield
 
+@contextlib.contextmanager
+def cephfs_setup(ctx, config):
+    mdss = list(teuthology.all_roles_of_type(ctx.cluster, 'mds'))
+
+    # If there are any MDSs, then create a filesystem for them to use
+    # Do this last because requires mon cluster to be up and running
+    if len(mdss) > 0:
+        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)
+        with contextutil.safe_while(sleep=2,tries=150) as proceed:
+            while proceed():
+                if len(mdsc.get_standby_daemons()) >= len(mdss):
+                    break
+
+        fss = []
+        for fs_config in fs_configs:
+            assert isinstance(fs_config, dict)
+            name = fs_config.pop('name')
+            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
+
+        for fs in fss:
+            fs.destroy()
+    else:
+        yield
 
 @contextlib.contextmanager
 def ceph_monitoring(daemon_type, ctx, config):
@@ -1524,6 +1573,7 @@ def task(ctx, config):
             lambda: ceph_mgrs(ctx=ctx, config=config),
             lambda: ceph_osds(ctx=ctx, config=config),
             lambda: ceph_mdss(ctx=ctx, config=config),
+            lambda: cephfs_setup(ctx=ctx, config=config),
             lambda: ceph_rgw(ctx=ctx, config=config),
             lambda: ceph_iscsi(ctx=ctx, config=config),
             lambda: ceph_monitoring('prometheus', ctx=ctx, config=config),
@@ -1533,16 +1583,6 @@ def task(ctx, config):
             lambda: ceph_clients(ctx=ctx, config=config),
             lambda: create_rbd_pool(ctx=ctx, config=config),
     ):
-        if not hasattr(ctx, 'managers'):
-            ctx.managers = {}
-        ctx.managers[cluster_name] = CephManager(
-            ctx.ceph[cluster_name].bootstrap_remote,
-            ctx=ctx,
-            logger=log.getChild('ceph_manager.' + cluster_name),
-            cluster=cluster_name,
-            cephadm=True,
-        )
-
         try:
             if config.get('wait-for-healthy', True):
                 healthy(ctx=ctx, config=config)