From 2436405c5d49cb3fae852763366c0541db175cb4 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 23 Jun 2021 20:36:20 -0700 Subject: [PATCH 1/7] qa/tasks/cephadm: setup file system if MDS are provisioned This is the same behavior/code as what the ceph task does. Signed-off-by: Patrick Donnelly --- qa/tasks/cephadm.py | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index d87c773aab683..d1e6b08ba9fc8 100644 --- 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 @@ -852,6 +854,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 +1563,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), From 27c1110129bd5c8eb7b58e7051e9c1ac2446328c Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 27 Jan 2022 20:55:58 -0500 Subject: [PATCH 2/7] qa/tasks/cephadm: setup CephManager when OSDs are provisioned The Filesystem object may use this when configuring EC data pools at file system creation (via a FuseMount). Signed-off-by: Patrick Donnelly --- qa/tasks/cephadm.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index d1e6b08ba9fc8..602676eed7f73 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -813,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 @@ -1573,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) From 50c39dc007615902e1fb040c03965c0bb3edc142 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 13 Jul 2021 11:31:47 -0700 Subject: [PATCH 3/7] qa: split fs begin task To allow switching to cephadm task. Signed-off-by: Patrick Donnelly --- qa/cephfs/begin/+ | 0 qa/cephfs/{begin.yaml => begin/0-install.yaml} | 4 ---- qa/cephfs/begin/1-ceph.yaml | 5 +++++ qa/cephfs/begin/2-logrotate.yaml | 3 +++ qa/suites/fs/32bits/begin | 1 + qa/suites/fs/32bits/begin.yaml | 1 - qa/suites/fs/bugs/client_trim_caps/begin | 1 + qa/suites/fs/bugs/client_trim_caps/begin.yaml | 1 - qa/suites/fs/full/begin | 1 + qa/suites/fs/full/begin.yaml | 1 - qa/suites/fs/functional/begin | 1 + qa/suites/fs/functional/begin.yaml | 1 - qa/suites/fs/libcephfs/begin | 1 + qa/suites/fs/libcephfs/begin.yaml | 1 - qa/suites/fs/mirror-ha/begin | 1 + qa/suites/fs/mirror-ha/begin.yaml | 1 - qa/suites/fs/mirror/begin | 1 + qa/suites/fs/mirror/begin.yaml | 1 - qa/suites/fs/mixed-clients/begin | 1 + qa/suites/fs/mixed-clients/begin.yaml | 1 - qa/suites/fs/multiclient/begin | 1 + qa/suites/fs/multiclient/begin.yaml | 1 - qa/suites/fs/multifs/begin | 1 + qa/suites/fs/multifs/begin.yaml | 1 - qa/suites/fs/permission/begin | 1 + qa/suites/fs/permission/begin.yaml | 1 - qa/suites/fs/shell/begin | 1 + qa/suites/fs/shell/begin.yaml | 1 - qa/suites/fs/snaps/begin | 1 + qa/suites/fs/snaps/begin.yaml | 1 - qa/suites/fs/thrash/multifs/begin | 1 + qa/suites/fs/thrash/multifs/begin.yaml | 1 - qa/suites/fs/thrash/workloads/begin | 1 + qa/suites/fs/thrash/workloads/begin.yaml | 1 - qa/suites/fs/top/begin | 1 + qa/suites/fs/top/begin.yaml | 1 - qa/suites/fs/traceless/begin | 1 + qa/suites/fs/traceless/begin.yaml | 1 - qa/suites/fs/valgrind/begin | 1 + qa/suites/fs/valgrind/begin.yaml | 1 - qa/suites/fs/verify/begin | 1 + qa/suites/fs/verify/begin.yaml | 1 - qa/suites/fs/volumes/begin | 1 + qa/suites/fs/volumes/begin.yaml | 1 - qa/suites/fs/workload/begin | 1 + qa/suites/fs/workload/begin.yaml | 1 - 46 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 qa/cephfs/begin/+ rename qa/cephfs/{begin.yaml => begin/0-install.yaml} (95%) create mode 100644 qa/cephfs/begin/1-ceph.yaml create mode 100644 qa/cephfs/begin/2-logrotate.yaml create mode 120000 qa/suites/fs/32bits/begin delete mode 120000 qa/suites/fs/32bits/begin.yaml create mode 120000 qa/suites/fs/bugs/client_trim_caps/begin delete mode 120000 qa/suites/fs/bugs/client_trim_caps/begin.yaml create mode 120000 qa/suites/fs/full/begin delete mode 120000 qa/suites/fs/full/begin.yaml create mode 120000 qa/suites/fs/functional/begin delete mode 120000 qa/suites/fs/functional/begin.yaml create mode 120000 qa/suites/fs/libcephfs/begin delete mode 120000 qa/suites/fs/libcephfs/begin.yaml create mode 120000 qa/suites/fs/mirror-ha/begin delete mode 120000 qa/suites/fs/mirror-ha/begin.yaml create mode 120000 qa/suites/fs/mirror/begin delete mode 120000 qa/suites/fs/mirror/begin.yaml create mode 120000 qa/suites/fs/mixed-clients/begin delete mode 120000 qa/suites/fs/mixed-clients/begin.yaml create mode 120000 qa/suites/fs/multiclient/begin delete mode 120000 qa/suites/fs/multiclient/begin.yaml create mode 120000 qa/suites/fs/multifs/begin delete mode 120000 qa/suites/fs/multifs/begin.yaml create mode 120000 qa/suites/fs/permission/begin delete mode 120000 qa/suites/fs/permission/begin.yaml create mode 120000 qa/suites/fs/shell/begin delete mode 120000 qa/suites/fs/shell/begin.yaml create mode 120000 qa/suites/fs/snaps/begin delete mode 120000 qa/suites/fs/snaps/begin.yaml create mode 120000 qa/suites/fs/thrash/multifs/begin delete mode 120000 qa/suites/fs/thrash/multifs/begin.yaml create mode 120000 qa/suites/fs/thrash/workloads/begin delete mode 120000 qa/suites/fs/thrash/workloads/begin.yaml create mode 120000 qa/suites/fs/top/begin delete mode 120000 qa/suites/fs/top/begin.yaml create mode 120000 qa/suites/fs/traceless/begin delete mode 120000 qa/suites/fs/traceless/begin.yaml create mode 120000 qa/suites/fs/valgrind/begin delete mode 120000 qa/suites/fs/valgrind/begin.yaml create mode 120000 qa/suites/fs/verify/begin delete mode 120000 qa/suites/fs/verify/begin.yaml create mode 120000 qa/suites/fs/volumes/begin delete mode 120000 qa/suites/fs/volumes/begin.yaml create mode 120000 qa/suites/fs/workload/begin delete mode 120000 qa/suites/fs/workload/begin.yaml diff --git a/qa/cephfs/begin/+ b/qa/cephfs/begin/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/cephfs/begin.yaml b/qa/cephfs/begin/0-install.yaml similarity index 95% rename from qa/cephfs/begin.yaml rename to qa/cephfs/begin/0-install.yaml index cbda380e57212..d7589aaca3f67 100644 --- a/qa/cephfs/begin.yaml +++ b/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 new file mode 100644 index 0000000000000..6765a266a4851 --- /dev/null +++ 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 new file mode 100644 index 0000000000000..3b876f13b6ade --- /dev/null +++ b/qa/cephfs/begin/2-logrotate.yaml @@ -0,0 +1,3 @@ +log-rotate: + ceph-mds: 10G + ceph-osd: 10G diff --git a/qa/suites/fs/32bits/begin b/qa/suites/fs/32bits/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/32bits/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/32bits/begin.yaml b/qa/suites/fs/32bits/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/32bits/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/bugs/client_trim_caps/begin b/qa/suites/fs/bugs/client_trim_caps/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/bugs/client_trim_caps/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/bugs/client_trim_caps/begin.yaml b/qa/suites/fs/bugs/client_trim_caps/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/bugs/client_trim_caps/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/full/begin b/qa/suites/fs/full/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/full/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/full/begin.yaml b/qa/suites/fs/full/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/full/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/functional/begin b/qa/suites/fs/functional/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/functional/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/functional/begin.yaml b/qa/suites/fs/functional/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/functional/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/libcephfs/begin b/qa/suites/fs/libcephfs/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/libcephfs/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/libcephfs/begin.yaml b/qa/suites/fs/libcephfs/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/libcephfs/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/mirror-ha/begin b/qa/suites/fs/mirror-ha/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/mirror-ha/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/mirror-ha/begin.yaml b/qa/suites/fs/mirror-ha/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/mirror-ha/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/mirror/begin b/qa/suites/fs/mirror/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/mirror/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/mirror/begin.yaml b/qa/suites/fs/mirror/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/mirror/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/mixed-clients/begin b/qa/suites/fs/mixed-clients/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/mixed-clients/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/mixed-clients/begin.yaml b/qa/suites/fs/mixed-clients/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/mixed-clients/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/multiclient/begin b/qa/suites/fs/multiclient/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/multiclient/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/multiclient/begin.yaml b/qa/suites/fs/multiclient/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/multiclient/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/multifs/begin b/qa/suites/fs/multifs/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/multifs/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/multifs/begin.yaml b/qa/suites/fs/multifs/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/multifs/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/permission/begin b/qa/suites/fs/permission/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/permission/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/permission/begin.yaml b/qa/suites/fs/permission/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/permission/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/shell/begin b/qa/suites/fs/shell/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/shell/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/shell/begin.yaml b/qa/suites/fs/shell/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/shell/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/snaps/begin b/qa/suites/fs/snaps/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/snaps/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/snaps/begin.yaml b/qa/suites/fs/snaps/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/snaps/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/multifs/begin b/qa/suites/fs/thrash/multifs/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/thrash/multifs/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/thrash/multifs/begin.yaml b/qa/suites/fs/thrash/multifs/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/thrash/multifs/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/begin b/qa/suites/fs/thrash/workloads/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/begin.yaml b/qa/suites/fs/thrash/workloads/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/thrash/workloads/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/top/begin b/qa/suites/fs/top/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/top/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/top/begin.yaml b/qa/suites/fs/top/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/top/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/traceless/begin b/qa/suites/fs/traceless/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/traceless/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/traceless/begin.yaml b/qa/suites/fs/traceless/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/traceless/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/valgrind/begin b/qa/suites/fs/valgrind/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/valgrind/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/valgrind/begin.yaml b/qa/suites/fs/valgrind/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/valgrind/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/verify/begin b/qa/suites/fs/verify/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/verify/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/verify/begin.yaml b/qa/suites/fs/verify/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/verify/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/volumes/begin b/qa/suites/fs/volumes/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/volumes/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/volumes/begin.yaml b/qa/suites/fs/volumes/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/volumes/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/workload/begin b/qa/suites/fs/workload/begin new file mode 120000 index 0000000000000..77af91f7d2660 --- /dev/null +++ b/qa/suites/fs/workload/begin @@ -0,0 +1 @@ +.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/workload/begin.yaml b/qa/suites/fs/workload/begin.yaml deleted file mode 120000 index 311d404f7c276..0000000000000 --- a/qa/suites/fs/workload/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file From 405bb2e48e5914e4b849bca5cb32660f13c4a00a Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 23 Jun 2021 20:37:02 -0700 Subject: [PATCH 4/7] qa: convert fs:workload to use cephadm Note: it's important to keep the install task which supplies packages needed for some workloads. Fixes: https://tracker.ceph.com/issues/51333 Signed-off-by: Patrick Donnelly --- qa/suites/fs/workload/begin | 1 - qa/suites/fs/workload/begin/+ | 0 qa/suites/fs/workload/begin/.qa | 1 + qa/suites/fs/workload/begin/0-install.yaml | 1 + qa/suites/fs/workload/begin/1-cephadm.yaml | 21 ++++++++++++++++++++ qa/suites/fs/workload/begin/2-logrotate.yaml | 1 + 6 files changed, 24 insertions(+), 1 deletion(-) delete mode 120000 qa/suites/fs/workload/begin create mode 100644 qa/suites/fs/workload/begin/+ create mode 120000 qa/suites/fs/workload/begin/.qa create mode 120000 qa/suites/fs/workload/begin/0-install.yaml create mode 100644 qa/suites/fs/workload/begin/1-cephadm.yaml create mode 120000 qa/suites/fs/workload/begin/2-logrotate.yaml diff --git a/qa/suites/fs/workload/begin b/qa/suites/fs/workload/begin deleted file mode 120000 index 77af91f7d2660..0000000000000 --- a/qa/suites/fs/workload/begin +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin/ \ No newline at end of file diff --git a/qa/suites/fs/workload/begin/+ b/qa/suites/fs/workload/begin/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/fs/workload/begin/.qa b/qa/suites/fs/workload/begin/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/fs/workload/begin/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/fs/workload/begin/0-install.yaml b/qa/suites/fs/workload/begin/0-install.yaml new file mode 120000 index 0000000000000..3b18529732df1 --- /dev/null +++ b/qa/suites/fs/workload/begin/0-install.yaml @@ -0,0 +1 @@ +.qa/cephfs/begin/0-install.yaml \ No newline at end of file diff --git a/qa/suites/fs/workload/begin/1-cephadm.yaml b/qa/suites/fs/workload/begin/1-cephadm.yaml new file mode 100644 index 0000000000000..a58ea5725f52e --- /dev/null +++ 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 new file mode 120000 index 0000000000000..9d6e7ba8335b9 --- /dev/null +++ b/qa/suites/fs/workload/begin/2-logrotate.yaml @@ -0,0 +1 @@ +.qa/cephfs/begin/2-logrotate.yaml \ No newline at end of file From 017ccd21e6ce58bd772ebcdcbac0e6ac1412f409 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 15 Jul 2021 10:35:41 -0700 Subject: [PATCH 5/7] qa: only use RHEL for workload testing It's not useful testing workloads with different distributions; it just adds to the maintenance burden of this qa suite as distro upgrades often break compilation of various tests. Signed-off-by: Patrick Donnelly --- qa/suites/fs/workload/distro | 1 - qa/suites/fs/workload/rhel_8.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 qa/suites/fs/workload/distro create mode 120000 qa/suites/fs/workload/rhel_8.yaml diff --git a/qa/suites/fs/workload/distro b/qa/suites/fs/workload/distro deleted file mode 120000 index 0862b4457b37a..0000000000000 --- a/qa/suites/fs/workload/distro +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/fs/workload/rhel_8.yaml b/qa/suites/fs/workload/rhel_8.yaml new file mode 120000 index 0000000000000..133acf27bff75 --- /dev/null +++ b/qa/suites/fs/workload/rhel_8.yaml @@ -0,0 +1 @@ +.qa/distros/all/rhel_8.yaml \ No newline at end of file From fb75ed6d391960f0826ac810b942afd2f0a662ea Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 23 Jul 2021 08:19:48 -0700 Subject: [PATCH 6/7] qa: stop overriding distro for k-testing This is a continuation of previous commit qa: only use RHEL for workload testing We don't want to test fs:workload with centos/ubuntu to avoid packaging issues and to reduce the matrix of distros we're running workloads on. Also, the testing kernel should install fine on the distros we test with "supported" random distros. Signed-off-by: Patrick Donnelly --- qa/cephfs/mount/kclient/overrides/distro/testing/% | 0 qa/cephfs/mount/kclient/overrides/distro/testing/flavor/.qa | 1 - .../kclient/overrides/distro/testing/flavor/centos_latest.yaml | 1 - .../kclient/overrides/distro/testing/flavor/ubuntu_latest.yaml | 1 - 4 files changed, 3 deletions(-) delete mode 100644 qa/cephfs/mount/kclient/overrides/distro/testing/% delete mode 120000 qa/cephfs/mount/kclient/overrides/distro/testing/flavor/.qa delete mode 120000 qa/cephfs/mount/kclient/overrides/distro/testing/flavor/centos_latest.yaml delete mode 120000 qa/cephfs/mount/kclient/overrides/distro/testing/flavor/ubuntu_latest.yaml diff --git a/qa/cephfs/mount/kclient/overrides/distro/testing/% b/qa/cephfs/mount/kclient/overrides/distro/testing/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/.qa b/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file 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 deleted file mode 120000 index bd9854e702982..0000000000000 --- a/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/centos_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_latest.yaml \ No newline at end of file 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 deleted file mode 120000 index 3a09f9abb05ca..0000000000000 --- a/qa/cephfs/mount/kclient/overrides/distro/testing/flavor/ubuntu_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/ubuntu_latest.yaml \ No newline at end of file From 0fcf8922dcedba0a9f36a59a44005389b5130702 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 3 Sep 2021 12:14:43 -0400 Subject: [PATCH 7/7] qa: update rhel kclient to setup container tools To fix [1,2]. [1] https://github.com/ceph/ceph/pull/42000#issuecomment-905628920 [2] https://github.com/ceph/ceph/pull/42000#issuecomment-906276775 Signed-off-by: Patrick Donnelly --- qa/suites/fs/workload/0-rhel_8.yaml | 1 + qa/suites/fs/workload/rhel_8.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 120000 qa/suites/fs/workload/0-rhel_8.yaml delete mode 120000 qa/suites/fs/workload/rhel_8.yaml diff --git a/qa/suites/fs/workload/0-rhel_8.yaml b/qa/suites/fs/workload/0-rhel_8.yaml new file mode 120000 index 0000000000000..b4b0a7892ce10 --- /dev/null +++ b/qa/suites/fs/workload/0-rhel_8.yaml @@ -0,0 +1 @@ +.qa/distros/podman/rhel_8.4_container_tools_rhel8.yaml \ No newline at end of file diff --git a/qa/suites/fs/workload/rhel_8.yaml b/qa/suites/fs/workload/rhel_8.yaml deleted file mode 120000 index 133acf27bff75..0000000000000 --- a/qa/suites/fs/workload/rhel_8.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/rhel_8.yaml \ No newline at end of file