From: Patrick Donnelly Date: Sun, 20 Dec 2020 02:55:40 +0000 (-0800) Subject: qa: merge multimds:thrash to fs:thrash X-Git-Tag: v16.1.0~107^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb45fc085ce7aaba52b27626c95b9c03446dac01;p=ceph.git qa: merge multimds:thrash to fs:thrash Signed-off-by: Patrick Donnelly Fixes: https://tracker.ceph.com/issues/48121 --- 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 000000000000..79fd84cf4f95 --- /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 d15ecfda012c..000000000000 --- 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 000000000000..2ab33af1c9cd --- /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 000000000000..fea2489fdf6d --- /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/fs/thrash/workloads/ranks/1.yaml b/qa/suites/fs/thrash/workloads/ranks/1.yaml new file mode 100644 index 000000000000..e69de29bb2d1 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 000000000000..9ed043c14849 --- /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 000000000000..ed89cef3a862 --- /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_snaptests.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_snaptests.yaml deleted file mode 100644 index 790c93c2b170..000000000000 --- a/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_snaptests.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - fs/snaps 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 c2e859fffbc8..000000000000 --- 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/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_suites_pjd.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_suites_pjd.yaml deleted file mode 100644 index f7784383be2c..000000000000 --- a/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_suites_pjd.yaml +++ /dev/null @@ -1,11 +0,0 @@ -overrides: - ceph: - conf: - client: - fuse set user groups: true -tasks: -- workunit: - timeout: 6h - clients: - all: - - suites/pjd.sh 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/cfuse_workunit_trivial_sync.yaml deleted file mode 120000 index a1df032772f1..000000000000 --- a/qa/suites/fs/thrash/workloads/tasks/2-workunit/cfuse_workunit_trivial_sync.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/tasks/cfuse_workunit_trivial_sync.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/ffsb.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/ffsb.yaml deleted file mode 100644 index 7e4f711a237d..000000000000 --- a/qa/suites/fs/thrash/workloads/tasks/2-workunit/ffsb.yaml +++ /dev/null @@ -1,13 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - SLOW_OPS - - slow request - conf: - osd: - filestore flush min: 0 -tasks: -- workunit: - clients: - all: - - suites/ffsb.sh diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/.qa b/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/.qa new file mode 120000 index 000000000000..a602a0353e75 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/snaps.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/snaps.yaml new file mode 100644 index 000000000000..790c93c2b170 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/snaps.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + all: + - fs/snaps diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/trivial_sync.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/trivial_sync.yaml new file mode 120000 index 000000000000..a1df032772f1 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/tasks/2-workunit/fs/trivial_sync.yaml @@ -0,0 +1 @@ +.qa/cephfs/tasks/cfuse_workunit_trivial_sync.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/iozone.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/iozone.yaml deleted file mode 100644 index 9270f3c51e22..000000000000 --- a/qa/suites/fs/thrash/workloads/tasks/2-workunit/iozone.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/iozone.sh diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/.qa b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/.qa new file mode 120000 index 000000000000..a602a0353e75 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/ffsb.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/ffsb.yaml new file mode 100644 index 000000000000..7e4f711a237d --- /dev/null +++ b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/ffsb.yaml @@ -0,0 +1,13 @@ +overrides: + ceph: + log-ignorelist: + - SLOW_OPS + - slow request + conf: + osd: + filestore flush min: 0 +tasks: +- workunit: + clients: + all: + - suites/ffsb.sh 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 000000000000..bae2202921ff --- /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/suites/iozone.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/iozone.yaml new file mode 100644 index 000000000000..9270f3c51e22 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/iozone.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + all: + - suites/iozone.sh diff --git a/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/pjd.yaml b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/pjd.yaml new file mode 100644 index 000000000000..f7784383be2c --- /dev/null +++ b/qa/suites/fs/thrash/workloads/tasks/2-workunit/suites/pjd.yaml @@ -0,0 +1,11 @@ +overrides: + ceph: + conf: + client: + fuse set user groups: true +tasks: +- workunit: + timeout: 6h + clients: + all: + - suites/pjd.sh diff --git a/qa/suites/multimds/thrash/% b/qa/suites/multimds/thrash/% deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/qa/suites/multimds/thrash/.qa b/qa/suites/multimds/thrash/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/multimds/thrash/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file 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 78f2991b407a..000000000000 --- 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 311d404f7c27..000000000000 --- 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 cbda5fa8df58..000000000000 --- 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/.qa b/qa/suites/multimds/thrash/clusters/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/multimds/thrash/clusters/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ 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 5936fcb53fe0..000000000000 --- 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 6775e621df99..000000000000 --- 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 16e8cc44b7d7..000000000000 --- 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 e3600f453f2f..000000000000 --- 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 435253f12e74..000000000000 --- 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 affe294932e2..000000000000 --- 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 e69de29bb2d1..000000000000 diff --git a/qa/suites/multimds/thrash/overrides/.qa b/qa/suites/multimds/thrash/overrides/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- 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 1da96a10bb56..000000000000 --- 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 1f0c36d23350..000000000000 --- 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 2243037cae95..000000000000 --- 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 a602a0353e75..000000000000 --- 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 7c81984b80cd..000000000000 --- 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 716290fd63cc..000000000000 --- 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