From cb45fc085ce7aaba52b27626c95b9c03446dac01 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sat, 19 Dec 2020 18:55:40 -0800 Subject: [PATCH] qa: merge multimds:thrash to fs:thrash Signed-off-by: Patrick Donnelly Fixes: https://tracker.ceph.com/issues/48121 --- qa/cephfs/clusters/1a5s-mds-1c-client.yaml | 9 +++++++++ .../thrash/workloads/clusters/1-mds-1-client-coloc.yaml | 1 - .../fs/thrash/workloads/clusters/1a5s-mds-1c-client.yaml | 1 + qa/suites/fs/thrash/workloads/ranks/.qa | 1 + .../thrash/% => fs/thrash/workloads/ranks/1.yaml} | 0 qa/suites/fs/thrash/workloads/ranks/3.yaml | 9 +++++++++ qa/suites/fs/thrash/workloads/ranks/5.yaml | 9 +++++++++ .../tasks/2-workunit/cfuse_workunit_suites_fsstress.yaml | 1 - .../thrash/workloads/tasks/2-workunit/fs}/.qa | 0 .../{cfuse_workunit_snaptests.yaml => fs/snaps.yaml} | 0 .../trivial_sync.yaml} | 0 .../thrash/workloads/tasks/2-workunit/suites}/.qa | 0 .../workloads/tasks/2-workunit/{ => suites}/ffsb.yaml | 0 .../workloads/tasks/2-workunit/suites/fsstress.yaml | 6 ++++++ .../workloads/tasks/2-workunit/{ => suites}/iozone.yaml | 0 .../{cfuse_workunit_suites_pjd.yaml => suites/pjd.yaml} | 0 qa/suites/multimds/thrash/0-supported-random-distro$ | 1 - qa/suites/multimds/thrash/begin.yaml | 1 - qa/suites/multimds/thrash/ceph-thrash | 1 - qa/suites/multimds/thrash/clusters/3-mds-2-standby.yaml | 4 ---- qa/suites/multimds/thrash/clusters/9-mds-3-standby.yaml | 4 ---- qa/suites/multimds/thrash/conf | 1 - qa/suites/multimds/thrash/mount | 1 - qa/suites/multimds/thrash/msgr-failures | 1 - qa/suites/multimds/thrash/objectstore-ec | 1 - qa/suites/multimds/thrash/overrides/% | 0 qa/suites/multimds/thrash/overrides/.qa | 1 - .../multimds/thrash/overrides/fuse-default-perm-no.yaml | 1 - qa/suites/multimds/thrash/overrides/thrash | 1 - qa/suites/multimds/thrash/overrides/thrash_debug.yaml | 7 ------- qa/suites/multimds/thrash/tasks/.qa | 1 - .../thrash/tasks/cfuse_workunit_suites_fsstress.yaml | 1 - .../multimds/thrash/tasks/cfuse_workunit_suites_pjd.yaml | 1 - 33 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 qa/cephfs/clusters/1a5s-mds-1c-client.yaml delete mode 120000 qa/suites/fs/thrash/workloads/clusters/1-mds-1-client-coloc.yaml create mode 120000 qa/suites/fs/thrash/workloads/clusters/1a5s-mds-1c-client.yaml create mode 120000 qa/suites/fs/thrash/workloads/ranks/.qa rename qa/suites/{multimds/thrash/% => fs/thrash/workloads/ranks/1.yaml} (100%) create mode 100644 qa/suites/fs/thrash/workloads/ranks/3.yaml create mode 100644 qa/suites/fs/thrash/workloads/ranks/5.yaml delete mode 120000 qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_suites_fsstress.yaml rename qa/suites/{multimds/thrash => fs/thrash/workloads/tasks/2-workunit/fs}/.qa (100%) rename qa/suites/fs/thrash/workloads/tasks/2-workunit/{cfuse_workunit_snaptests.yaml => fs/snaps.yaml} (100%) rename qa/suites/fs/thrash/workloads/tasks/2-workunit/{cfuse_workunit_trivial_sync.yaml => fs/trivial_sync.yaml} (100%) rename qa/suites/{multimds/thrash/clusters => fs/thrash/workloads/tasks/2-workunit/suites}/.qa (100%) rename qa/suites/fs/thrash/workloads/tasks/2-workunit/{ => suites}/ffsb.yaml (100%) create mode 100644 qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/fsstress.yaml rename qa/suites/fs/thrash/workloads/tasks/2-workunit/{ => suites}/iozone.yaml (100%) rename qa/suites/fs/thrash/workloads/tasks/2-workunit/{cfuse_workunit_suites_pjd.yaml => suites/pjd.yaml} (100%) delete mode 120000 qa/suites/multimds/thrash/0-supported-random-distro$ delete mode 120000 qa/suites/multimds/thrash/begin.yaml delete mode 120000 qa/suites/multimds/thrash/ceph-thrash delete mode 100644 qa/suites/multimds/thrash/clusters/3-mds-2-standby.yaml delete mode 100644 qa/suites/multimds/thrash/clusters/9-mds-3-standby.yaml delete mode 120000 qa/suites/multimds/thrash/conf delete mode 120000 qa/suites/multimds/thrash/mount delete mode 120000 qa/suites/multimds/thrash/msgr-failures delete mode 120000 qa/suites/multimds/thrash/objectstore-ec delete mode 100644 qa/suites/multimds/thrash/overrides/% delete mode 120000 qa/suites/multimds/thrash/overrides/.qa delete mode 120000 qa/suites/multimds/thrash/overrides/fuse-default-perm-no.yaml delete mode 120000 qa/suites/multimds/thrash/overrides/thrash delete mode 100644 qa/suites/multimds/thrash/overrides/thrash_debug.yaml delete mode 120000 qa/suites/multimds/thrash/tasks/.qa delete mode 120000 qa/suites/multimds/thrash/tasks/cfuse_workunit_suites_fsstress.yaml delete mode 120000 qa/suites/multimds/thrash/tasks/cfuse_workunit_suites_pjd.yaml diff --git a/qa/cephfs/clusters/1a5s-mds-1c-client.yaml b/qa/cephfs/clusters/1a5s-mds-1c-client.yaml new file mode 100644 index 00000000000..79fd84cf4f9 --- /dev/null +++ b/qa/cephfs/clusters/1a5s-mds-1c-client.yaml @@ -0,0 +1,9 @@ +roles: +- [mon.a, mgr.y, mds.a, mds.c, mds.e, osd.0, osd.1, osd.2, osd.3, client.0] +- [mon.b, mon.c, mgr.x, mds.b, mds.d, mds.f, osd.4, osd.5, osd.6, osd.7] +openstack: +- volumes: # attached to each instance + count: 4 + size: 20 # GB +- machine: + disk: 200 # GB diff --git a/qa/suites/fs/thrash/workloads/clusters/1-mds-1-client-coloc.yaml b/qa/suites/fs/thrash/workloads/clusters/1-mds-1-client-coloc.yaml deleted file mode 120000 index d15ecfda012..00000000000 --- a/qa/suites/fs/thrash/workloads/clusters/1-mds-1-client-coloc.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/clusters/1-mds-1-client-coloc.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/clusters/1a5s-mds-1c-client.yaml b/qa/suites/fs/thrash/workloads/clusters/1a5s-mds-1c-client.yaml new file mode 120000 index 00000000000..2ab33af1c9c --- /dev/null +++ b/qa/suites/fs/thrash/workloads/clusters/1a5s-mds-1c-client.yaml @@ -0,0 +1 @@ +.qa/cephfs/clusters/1a5s-mds-1c-client.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/ranks/.qa b/qa/suites/fs/thrash/workloads/ranks/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/ranks/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/multimds/thrash/% b/qa/suites/fs/thrash/workloads/ranks/1.yaml similarity index 100% rename from qa/suites/multimds/thrash/% rename to qa/suites/fs/thrash/workloads/ranks/1.yaml diff --git a/qa/suites/fs/thrash/workloads/ranks/3.yaml b/qa/suites/fs/thrash/workloads/ranks/3.yaml new file mode 100644 index 00000000000..9ed043c1484 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/ranks/3.yaml @@ -0,0 +1,9 @@ +overrides: + ceph: + cephfs: + max_mds: 3 + check-counter: + counters: + mds: + - mds.exported + - mds.imported diff --git a/qa/suites/fs/thrash/workloads/ranks/5.yaml b/qa/suites/fs/thrash/workloads/ranks/5.yaml new file mode 100644 index 00000000000..ed89cef3a86 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/ranks/5.yaml @@ -0,0 +1,9 @@ +overrides: + ceph: + cephfs: + max_mds: 5 + check-counter: + counters: + mds: + - mds.exported + - mds.imported diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_suites_fsstress.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_suites_fsstress.yaml deleted file mode 120000 index c2e859fffbc..00000000000 --- a/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_suites_fsstress.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml \ No newline at end of file diff --git a/qa/suites/multimds/thrash/.qa b/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/.qa similarity index 100% rename from qa/suites/multimds/thrash/.qa rename to qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/.qa diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_snaptests.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/snaps.yaml similarity index 100% rename from qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_snaptests.yaml rename to qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/snaps.yaml diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_trivial_sync.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/trivial_sync.yaml similarity index 100% rename from qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_trivial_sync.yaml rename to qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/trivial_sync.yaml diff --git a/qa/suites/multimds/thrash/clusters/.qa b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/.qa similarity index 100% rename from qa/suites/multimds/thrash/clusters/.qa rename to qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/.qa diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/ffsb.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/ffsb.yaml similarity index 100% rename from qa/suites/fs/thrash/workloads/tasks/2-workunit/ffsb.yaml rename to qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/ffsb.yaml diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/fsstress.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/fsstress.yaml new file mode 100644 index 00000000000..bae2202921f --- /dev/null +++ b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/fsstress.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + timeout: 6h + clients: + all: + - suites/fsstress.sh diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/iozone.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/iozone.yaml similarity index 100% rename from qa/suites/fs/thrash/workloads/tasks/2-workunit/iozone.yaml rename to qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/iozone.yaml diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_suites_pjd.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/pjd.yaml similarity index 100% rename from qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_suites_pjd.yaml rename to qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/pjd.yaml diff --git a/qa/suites/multimds/thrash/0-supported-random-distro$ b/qa/suites/multimds/thrash/0-supported-random-distro$ deleted file mode 120000 index 78f2991b407..00000000000 --- a/qa/suites/multimds/thrash/0-supported-random-distro$ +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported-random-distro$/ \ No newline at end of file diff --git a/qa/suites/multimds/thrash/begin.yaml b/qa/suites/multimds/thrash/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- a/qa/suites/multimds/thrash/begin.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/multimds/thrash/ceph-thrash b/qa/suites/multimds/thrash/ceph-thrash deleted file mode 120000 index cbda5fa8df5..00000000000 --- a/qa/suites/multimds/thrash/ceph-thrash +++ /dev/null @@ -1 +0,0 @@ -.qa/suites/fs/thrash/tasks/1-thrash/ \ No newline at end of file diff --git a/qa/suites/multimds/thrash/clusters/3-mds-2-standby.yaml b/qa/suites/multimds/thrash/clusters/3-mds-2-standby.yaml deleted file mode 100644 index 5936fcb53fe..00000000000 --- a/qa/suites/multimds/thrash/clusters/3-mds-2-standby.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.c, mds.a, mds.c, mds.e, osd.0, osd.1, osd.2] -- [mon.b, mgr.x, mds.b, mds.d, osd.3, osd.4, osd.5] -- [client.0] diff --git a/qa/suites/multimds/thrash/clusters/9-mds-3-standby.yaml b/qa/suites/multimds/thrash/clusters/9-mds-3-standby.yaml deleted file mode 100644 index 6775e621df9..00000000000 --- a/qa/suites/multimds/thrash/clusters/9-mds-3-standby.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.c, mds.a, mds.c, mds.e, mds.g, mds.i, mds.k, osd.0, osd.1, osd.2] -- [mon.b, mgr.x, mds.b, mds.d, mds.f, mds.h, mds.j, mds.l, osd.3, osd.4, osd.5] -- [client.0] diff --git a/qa/suites/multimds/thrash/conf b/qa/suites/multimds/thrash/conf deleted file mode 120000 index 16e8cc44b7d..00000000000 --- a/qa/suites/multimds/thrash/conf +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/conf \ No newline at end of file diff --git a/qa/suites/multimds/thrash/mount b/qa/suites/multimds/thrash/mount deleted file mode 120000 index e3600f453f2..00000000000 --- a/qa/suites/multimds/thrash/mount +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/mount/ \ No newline at end of file diff --git a/qa/suites/multimds/thrash/msgr-failures b/qa/suites/multimds/thrash/msgr-failures deleted file mode 120000 index 435253f12e7..00000000000 --- a/qa/suites/multimds/thrash/msgr-failures +++ /dev/null @@ -1 +0,0 @@ -.qa/suites/fs/thrash/msgr-failures/ \ No newline at end of file diff --git a/qa/suites/multimds/thrash/objectstore-ec b/qa/suites/multimds/thrash/objectstore-ec deleted file mode 120000 index affe294932e..00000000000 --- a/qa/suites/multimds/thrash/objectstore-ec +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/objectstore-ec \ No newline at end of file diff --git a/qa/suites/multimds/thrash/overrides/% b/qa/suites/multimds/thrash/overrides/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/multimds/thrash/overrides/.qa b/qa/suites/multimds/thrash/overrides/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/multimds/thrash/overrides/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/multimds/thrash/overrides/fuse-default-perm-no.yaml b/qa/suites/multimds/thrash/overrides/fuse-default-perm-no.yaml deleted file mode 120000 index 1da96a10bb5..00000000000 --- a/qa/suites/multimds/thrash/overrides/fuse-default-perm-no.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/overrides/fuse/default-perm/no.yaml \ No newline at end of file diff --git a/qa/suites/multimds/thrash/overrides/thrash b/qa/suites/multimds/thrash/overrides/thrash deleted file mode 120000 index 1f0c36d2335..00000000000 --- a/qa/suites/multimds/thrash/overrides/thrash +++ /dev/null @@ -1 +0,0 @@ -../../../fs/thrash/overrides/ \ No newline at end of file diff --git a/qa/suites/multimds/thrash/overrides/thrash_debug.yaml b/qa/suites/multimds/thrash/overrides/thrash_debug.yaml deleted file mode 100644 index 2243037cae9..00000000000 --- a/qa/suites/multimds/thrash/overrides/thrash_debug.yaml +++ /dev/null @@ -1,7 +0,0 @@ -overrides: - ceph: - conf: - mds: - debug ms: 10 - client: - debug ms: 10 diff --git a/qa/suites/multimds/thrash/tasks/.qa b/qa/suites/multimds/thrash/tasks/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/multimds/thrash/tasks/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/multimds/thrash/tasks/cfuse_workunit_suites_fsstress.yaml b/qa/suites/multimds/thrash/tasks/cfuse_workunit_suites_fsstress.yaml deleted file mode 120000 index 7c81984b80c..00000000000 --- a/qa/suites/multimds/thrash/tasks/cfuse_workunit_suites_fsstress.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_suites_fsstress.yaml \ No newline at end of file diff --git a/qa/suites/multimds/thrash/tasks/cfuse_workunit_suites_pjd.yaml b/qa/suites/multimds/thrash/tasks/cfuse_workunit_suites_pjd.yaml deleted file mode 120000 index 716290fd63c..00000000000 --- a/qa/suites/multimds/thrash/tasks/cfuse_workunit_suites_pjd.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_suites_pjd.yaml \ No newline at end of file -- 2.47.3