From 9be89e58cfdf1c664a57c300a2af35f5fb788cde Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sun, 7 Aug 2016 22:25:19 -0400 Subject: [PATCH] suites/multimds: sync with fs suites This commit synchronizes the multimds suite with the fs suite. The basic/verify sub-suites now do the same tests except with different cluster layouts (i.e. multiple actives). This is mostly accomplished by symlinking parts of each sub-suite to its counterpart in the fs suite. This commit also does a few things of note to the prior multimds suite: o Turn on directory fragmentation. o Add several tests from fs/basic/tasks to multimds/basic. o Remove libcephfs as fs/basic/tasks already contain multimds/basic/tasks. Prior implementation and discussion are in PR#1114: https://github.com/ceph/ceph-qa-suite/pull/1114 Signed-off-by: Patrick Donnelly --- cephfs/clusters/3-mds.yaml | 4 ++++ .../libcephfs => cephfs}/clusters/9-mds.yaml | 3 ++- cephfs/mount/kclient.yaml | 7 +++++++ .../overrides/fuse/default-perm}/% | 0 cephfs/overrides/fuse/default-perm/no.yaml | 5 +++++ cephfs/overrides/fuse/default-perm/yes.yaml | 5 +++++ suites/multimds/basic/begin.yaml | 1 + suites/multimds/basic/ceph/base.yaml | 6 ------ suites/multimds/basic/clusters/3-mds.yaml | 5 +---- suites/multimds/basic/clusters/9-mds.yaml | 5 +---- suites/multimds/basic/debug/mds_client.yaml | 1 - suites/multimds/basic/fs | 1 + suites/multimds/basic/fs/xfs.yaml | 1 - suites/multimds/basic/inline | 1 + suites/multimds/basic/inline/yes.yaml | 4 ---- suites/multimds/basic/mount/cfuse.yaml | 2 -- suites/multimds/basic/mount/fuse.yaml | 1 + suites/multimds/basic/mount/kclient.yaml | 8 +------- .../basic/{inline/no.yaml => overrides/%} | 0 suites/multimds/basic/overrides/basic | 1 + .../basic/overrides/fuse-default-perm-no.yaml | 1 + .../whitelist_wrongly_marked_down.yaml | 1 - suites/multimds/basic/tasks | 1 + .../basic/tasks/kernel_untar_build.yaml | 10 ---------- suites/multimds/basic/tasks/misc.yaml | 6 ------ .../multimds/basic/tasks/misc_test_o_trunc.yaml | 5 ----- .../multimds/basic/tasks/suites_blogbench.yaml | 5 ----- suites/multimds/basic/tasks/suites_dbench.yaml | 5 ----- suites/multimds/basic/tasks/suites_ffsb.yaml | 10 ---------- .../multimds/basic/tasks/suites_fsstress.yaml | 5 ----- suites/multimds/basic/tasks/suites_fsx.yaml | 5 ----- suites/multimds/basic/tasks/suites_fsync.yaml | 5 ----- suites/multimds/basic/tasks/suites_iogen.yaml | 5 ----- suites/multimds/basic/tasks/suites_iozone.yaml | 5 ----- suites/multimds/basic/tasks/suites_pjd.yaml | 16 ---------------- .../basic/tasks/suites_truncate_delay.yaml | 14 -------------- suites/multimds/basic/tasks/trivial_sync.yaml | 4 ---- suites/multimds/libcephfs/ceph/base.yaml | 6 ------ suites/multimds/libcephfs/clusters/3-mds.yaml | 4 ---- suites/multimds/libcephfs/debug/mds_client.yaml | 1 - suites/multimds/libcephfs/fs/xfs.yaml | 1 - suites/multimds/libcephfs/inline/yes.yaml | 4 ---- .../whitelist_wrongly_marked_down.yaml | 1 - .../tasks/libcephfs_interface_tests.yaml | 9 --------- .../libcephfs/tasks/libcephfs_java.yaml | 9 --------- .../libcephfs/tasks/mds_creation_retry.yaml | 6 ------ suites/multimds/verify/begin.yaml | 1 + suites/multimds/verify/ceph/base.yaml | 6 ------ suites/multimds/verify/clusters/3-mds.yaml | 4 +--- suites/multimds/verify/clusters/9-mds.yaml | 4 +--- suites/multimds/verify/debug/mds_client.yaml | 1 - suites/multimds/verify/fs | 1 + suites/multimds/verify/fs/xfs.yaml | 1 - suites/multimds/verify/mount/fuse.yaml | 1 + suites/multimds/verify/mount/kclient.yaml | 1 + .../inline/no.yaml => verify/overrides/%} | 0 .../verify/overrides/fuse-default-perm-no.yaml | 1 + suites/multimds/verify/overrides/verify | 1 + .../whitelist_wrongly_marked_down.yaml | 1 - suites/multimds/verify/tasks | 1 + .../tasks/cfuse_workunit_suites_dbench.yaml | 6 ------ .../tasks/cfuse_workunit_suites_fsstress.yaml | 6 ------ .../verify/tasks/libcephfs_interface_tests.yaml | 6 ------ suites/multimds/verify/validater | 1 + suites/multimds/verify/validater/lockdep.yaml | 5 ----- suites/multimds/verify/validater/valgrind.yaml | 17 ----------------- 66 files changed, 43 insertions(+), 227 deletions(-) create mode 100644 cephfs/clusters/3-mds.yaml rename {suites/multimds/libcephfs => cephfs}/clusters/9-mds.yaml (90%) create mode 100644 cephfs/mount/kclient.yaml rename {suites/multimds/libcephfs => cephfs/overrides/fuse/default-perm}/% (100%) create mode 100644 cephfs/overrides/fuse/default-perm/no.yaml create mode 100644 cephfs/overrides/fuse/default-perm/yes.yaml create mode 120000 suites/multimds/basic/begin.yaml delete mode 100644 suites/multimds/basic/ceph/base.yaml mode change 100644 => 120000 suites/multimds/basic/clusters/3-mds.yaml mode change 100644 => 120000 suites/multimds/basic/clusters/9-mds.yaml delete mode 120000 suites/multimds/basic/debug/mds_client.yaml create mode 120000 suites/multimds/basic/fs delete mode 120000 suites/multimds/basic/fs/xfs.yaml create mode 120000 suites/multimds/basic/inline delete mode 100644 suites/multimds/basic/inline/yes.yaml delete mode 100644 suites/multimds/basic/mount/cfuse.yaml create mode 120000 suites/multimds/basic/mount/fuse.yaml mode change 100644 => 120000 suites/multimds/basic/mount/kclient.yaml rename suites/multimds/basic/{inline/no.yaml => overrides/%} (100%) create mode 120000 suites/multimds/basic/overrides/basic create mode 120000 suites/multimds/basic/overrides/fuse-default-perm-no.yaml delete mode 120000 suites/multimds/basic/overrides/whitelist_wrongly_marked_down.yaml create mode 120000 suites/multimds/basic/tasks delete mode 100644 suites/multimds/basic/tasks/kernel_untar_build.yaml delete mode 100644 suites/multimds/basic/tasks/misc.yaml delete mode 100644 suites/multimds/basic/tasks/misc_test_o_trunc.yaml delete mode 100644 suites/multimds/basic/tasks/suites_blogbench.yaml delete mode 100644 suites/multimds/basic/tasks/suites_dbench.yaml delete mode 100644 suites/multimds/basic/tasks/suites_ffsb.yaml delete mode 100644 suites/multimds/basic/tasks/suites_fsstress.yaml delete mode 100644 suites/multimds/basic/tasks/suites_fsx.yaml delete mode 100644 suites/multimds/basic/tasks/suites_fsync.yaml delete mode 100644 suites/multimds/basic/tasks/suites_iogen.yaml delete mode 100644 suites/multimds/basic/tasks/suites_iozone.yaml delete mode 100644 suites/multimds/basic/tasks/suites_pjd.yaml delete mode 100644 suites/multimds/basic/tasks/suites_truncate_delay.yaml delete mode 100644 suites/multimds/basic/tasks/trivial_sync.yaml delete mode 100644 suites/multimds/libcephfs/ceph/base.yaml delete mode 100644 suites/multimds/libcephfs/clusters/3-mds.yaml delete mode 120000 suites/multimds/libcephfs/debug/mds_client.yaml delete mode 120000 suites/multimds/libcephfs/fs/xfs.yaml delete mode 100644 suites/multimds/libcephfs/inline/yes.yaml delete mode 120000 suites/multimds/libcephfs/overrides/whitelist_wrongly_marked_down.yaml delete mode 100644 suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml delete mode 100644 suites/multimds/libcephfs/tasks/libcephfs_java.yaml delete mode 100644 suites/multimds/libcephfs/tasks/mds_creation_retry.yaml create mode 120000 suites/multimds/verify/begin.yaml delete mode 100644 suites/multimds/verify/ceph/base.yaml mode change 100644 => 120000 suites/multimds/verify/clusters/3-mds.yaml mode change 100644 => 120000 suites/multimds/verify/clusters/9-mds.yaml delete mode 120000 suites/multimds/verify/debug/mds_client.yaml create mode 120000 suites/multimds/verify/fs delete mode 120000 suites/multimds/verify/fs/xfs.yaml create mode 120000 suites/multimds/verify/mount/fuse.yaml create mode 120000 suites/multimds/verify/mount/kclient.yaml rename suites/multimds/{libcephfs/inline/no.yaml => verify/overrides/%} (100%) create mode 120000 suites/multimds/verify/overrides/fuse-default-perm-no.yaml create mode 120000 suites/multimds/verify/overrides/verify delete mode 120000 suites/multimds/verify/overrides/whitelist_wrongly_marked_down.yaml create mode 120000 suites/multimds/verify/tasks delete mode 100644 suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml delete mode 100644 suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml delete mode 100644 suites/multimds/verify/tasks/libcephfs_interface_tests.yaml create mode 120000 suites/multimds/verify/validater delete mode 100644 suites/multimds/verify/validater/lockdep.yaml delete mode 100644 suites/multimds/verify/validater/valgrind.yaml diff --git a/cephfs/clusters/3-mds.yaml b/cephfs/clusters/3-mds.yaml new file mode 100644 index 00000000000..c655b90c81c --- /dev/null +++ b/cephfs/clusters/3-mds.yaml @@ -0,0 +1,4 @@ +roles: +- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2] +- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5] +- [client.0] diff --git a/suites/multimds/libcephfs/clusters/9-mds.yaml b/cephfs/clusters/9-mds.yaml similarity index 90% rename from suites/multimds/libcephfs/clusters/9-mds.yaml rename to cephfs/clusters/9-mds.yaml index 252a63e49d1..ed554c9fe3c 100644 --- a/suites/multimds/libcephfs/clusters/9-mds.yaml +++ b/cephfs/clusters/9-mds.yaml @@ -1,3 +1,4 @@ roles: - [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2] -- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5, client.0] +- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5] +- [client.0] diff --git a/cephfs/mount/kclient.yaml b/cephfs/mount/kclient.yaml new file mode 100644 index 00000000000..f00f16aea22 --- /dev/null +++ b/cephfs/mount/kclient.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + global: + ms die on skipped message: false +tasks: +- kclient: diff --git a/suites/multimds/libcephfs/% b/cephfs/overrides/fuse/default-perm/% similarity index 100% rename from suites/multimds/libcephfs/% rename to cephfs/overrides/fuse/default-perm/% diff --git a/cephfs/overrides/fuse/default-perm/no.yaml b/cephfs/overrides/fuse/default-perm/no.yaml new file mode 100644 index 00000000000..445e936526c --- /dev/null +++ b/cephfs/overrides/fuse/default-perm/no.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client: + fuse default permissions: false diff --git a/cephfs/overrides/fuse/default-perm/yes.yaml b/cephfs/overrides/fuse/default-perm/yes.yaml new file mode 100644 index 00000000000..2fd210a39d7 --- /dev/null +++ b/cephfs/overrides/fuse/default-perm/yes.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client: + fuse default permissions: true diff --git a/suites/multimds/basic/begin.yaml b/suites/multimds/basic/begin.yaml new file mode 120000 index 00000000000..61b6545836d --- /dev/null +++ b/suites/multimds/basic/begin.yaml @@ -0,0 +1 @@ +../../fs/basic/begin.yaml \ No newline at end of file diff --git a/suites/multimds/basic/ceph/base.yaml b/suites/multimds/basic/ceph/base.yaml deleted file mode 100644 index 50b60b5152b..00000000000 --- a/suites/multimds/basic/ceph/base.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- install: -- ceph: - conf: - client: - fuse_default_permissions: 0 diff --git a/suites/multimds/basic/clusters/3-mds.yaml b/suites/multimds/basic/clusters/3-mds.yaml deleted file mode 100644 index c655b90c81c..00000000000 --- a/suites/multimds/basic/clusters/3-mds.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2] -- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5] -- [client.0] diff --git a/suites/multimds/basic/clusters/3-mds.yaml b/suites/multimds/basic/clusters/3-mds.yaml new file mode 120000 index 00000000000..97d5edc6011 --- /dev/null +++ b/suites/multimds/basic/clusters/3-mds.yaml @@ -0,0 +1 @@ +../../../../cephfs/clusters/3-mds.yaml \ No newline at end of file diff --git a/suites/multimds/basic/clusters/9-mds.yaml b/suites/multimds/basic/clusters/9-mds.yaml deleted file mode 100644 index ed554c9fe3c..00000000000 --- a/suites/multimds/basic/clusters/9-mds.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2] -- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5] -- [client.0] diff --git a/suites/multimds/basic/clusters/9-mds.yaml b/suites/multimds/basic/clusters/9-mds.yaml new file mode 120000 index 00000000000..c5222943220 --- /dev/null +++ b/suites/multimds/basic/clusters/9-mds.yaml @@ -0,0 +1 @@ +../../../../cephfs/clusters/9-mds.yaml \ No newline at end of file diff --git a/suites/multimds/basic/debug/mds_client.yaml b/suites/multimds/basic/debug/mds_client.yaml deleted file mode 120000 index 335c1cafed7..00000000000 --- a/suites/multimds/basic/debug/mds_client.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../debug/mds_client.yaml \ No newline at end of file diff --git a/suites/multimds/basic/fs b/suites/multimds/basic/fs new file mode 120000 index 00000000000..a7abfe44409 --- /dev/null +++ b/suites/multimds/basic/fs @@ -0,0 +1 @@ +../../fs/basic/fs/ \ No newline at end of file diff --git a/suites/multimds/basic/fs/xfs.yaml b/suites/multimds/basic/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b..00000000000 --- a/suites/multimds/basic/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/multimds/basic/inline b/suites/multimds/basic/inline new file mode 120000 index 00000000000..3b88069e983 --- /dev/null +++ b/suites/multimds/basic/inline @@ -0,0 +1 @@ +../../fs/basic/inline/ \ No newline at end of file diff --git a/suites/multimds/basic/inline/yes.yaml b/suites/multimds/basic/inline/yes.yaml deleted file mode 100644 index ae5222f6bcb..00000000000 --- a/suites/multimds/basic/inline/yes.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- exec: - client.0: - - sudo ceph mds set inline_data true --yes-i-really-mean-it diff --git a/suites/multimds/basic/mount/cfuse.yaml b/suites/multimds/basic/mount/cfuse.yaml deleted file mode 100644 index e3c34a1f604..00000000000 --- a/suites/multimds/basic/mount/cfuse.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- ceph-fuse: diff --git a/suites/multimds/basic/mount/fuse.yaml b/suites/multimds/basic/mount/fuse.yaml new file mode 120000 index 00000000000..af9ee0ab798 --- /dev/null +++ b/suites/multimds/basic/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/multimds/basic/mount/kclient.yaml b/suites/multimds/basic/mount/kclient.yaml deleted file mode 100644 index f00f16aea22..00000000000 --- a/suites/multimds/basic/mount/kclient.yaml +++ /dev/null @@ -1,7 +0,0 @@ -overrides: - ceph: - conf: - global: - ms die on skipped message: false -tasks: -- kclient: diff --git a/suites/multimds/basic/mount/kclient.yaml b/suites/multimds/basic/mount/kclient.yaml new file mode 120000 index 00000000000..b6f2aad4a0f --- /dev/null +++ b/suites/multimds/basic/mount/kclient.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/kclient.yaml \ No newline at end of file diff --git a/suites/multimds/basic/inline/no.yaml b/suites/multimds/basic/overrides/% similarity index 100% rename from suites/multimds/basic/inline/no.yaml rename to suites/multimds/basic/overrides/% diff --git a/suites/multimds/basic/overrides/basic b/suites/multimds/basic/overrides/basic new file mode 120000 index 00000000000..1ccfd0e4352 --- /dev/null +++ b/suites/multimds/basic/overrides/basic @@ -0,0 +1 @@ +../../../fs/basic/overrides/ \ No newline at end of file diff --git a/suites/multimds/basic/overrides/fuse-default-perm-no.yaml b/suites/multimds/basic/overrides/fuse-default-perm-no.yaml new file mode 120000 index 00000000000..1bada5b5acb --- /dev/null +++ b/suites/multimds/basic/overrides/fuse-default-perm-no.yaml @@ -0,0 +1 @@ +../../../../cephfs/overrides/fuse/default-perm/no.yaml \ No newline at end of file diff --git a/suites/multimds/basic/overrides/whitelist_wrongly_marked_down.yaml b/suites/multimds/basic/overrides/whitelist_wrongly_marked_down.yaml deleted file mode 120000 index 08f746bf894..00000000000 --- a/suites/multimds/basic/overrides/whitelist_wrongly_marked_down.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../overrides/whitelist_wrongly_marked_down.yaml \ No newline at end of file diff --git a/suites/multimds/basic/tasks b/suites/multimds/basic/tasks new file mode 120000 index 00000000000..c65dcf48fd0 --- /dev/null +++ b/suites/multimds/basic/tasks @@ -0,0 +1 @@ +../../fs/basic/tasks/ \ No newline at end of file diff --git a/suites/multimds/basic/tasks/kernel_untar_build.yaml b/suites/multimds/basic/tasks/kernel_untar_build.yaml deleted file mode 100644 index 8dbc24a9feb..00000000000 --- a/suites/multimds/basic/tasks/kernel_untar_build.yaml +++ /dev/null @@ -1,10 +0,0 @@ -overrides: - ceph: - conf: - client: - fuse_default_permissions: 0 -tasks: -- workunit: - clients: - all: - - kernel_untar_build.sh diff --git a/suites/multimds/basic/tasks/misc.yaml b/suites/multimds/basic/tasks/misc.yaml deleted file mode 100644 index 6c8327bb0d7..00000000000 --- a/suites/multimds/basic/tasks/misc.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- workunit: - timeout: 5h - clients: - all: - - fs/misc diff --git a/suites/multimds/basic/tasks/misc_test_o_trunc.yaml b/suites/multimds/basic/tasks/misc_test_o_trunc.yaml deleted file mode 100644 index c9de5c38637..00000000000 --- a/suites/multimds/basic/tasks/misc_test_o_trunc.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - fs/test_o_trunc.sh diff --git a/suites/multimds/basic/tasks/suites_blogbench.yaml b/suites/multimds/basic/tasks/suites_blogbench.yaml deleted file mode 100644 index 4c1fcc11ed9..00000000000 --- a/suites/multimds/basic/tasks/suites_blogbench.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/blogbench.sh diff --git a/suites/multimds/basic/tasks/suites_dbench.yaml b/suites/multimds/basic/tasks/suites_dbench.yaml deleted file mode 100644 index 41b2bc8edaa..00000000000 --- a/suites/multimds/basic/tasks/suites_dbench.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/dbench.sh diff --git a/suites/multimds/basic/tasks/suites_ffsb.yaml b/suites/multimds/basic/tasks/suites_ffsb.yaml deleted file mode 100644 index 4a2a627fe5d..00000000000 --- a/suites/multimds/basic/tasks/suites_ffsb.yaml +++ /dev/null @@ -1,10 +0,0 @@ -overrides: - ceph: - conf: - osd: - filestore flush min: 0 -tasks: -- workunit: - clients: - all: - - suites/ffsb.sh diff --git a/suites/multimds/basic/tasks/suites_fsstress.yaml b/suites/multimds/basic/tasks/suites_fsstress.yaml deleted file mode 100644 index ddb18fb791a..00000000000 --- a/suites/multimds/basic/tasks/suites_fsstress.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/fsstress.sh diff --git a/suites/multimds/basic/tasks/suites_fsx.yaml b/suites/multimds/basic/tasks/suites_fsx.yaml deleted file mode 100644 index 8b2b1ab5c14..00000000000 --- a/suites/multimds/basic/tasks/suites_fsx.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/fsx.sh diff --git a/suites/multimds/basic/tasks/suites_fsync.yaml b/suites/multimds/basic/tasks/suites_fsync.yaml deleted file mode 100644 index 7efa1adb82d..00000000000 --- a/suites/multimds/basic/tasks/suites_fsync.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/fsync-tester.sh diff --git a/suites/multimds/basic/tasks/suites_iogen.yaml b/suites/multimds/basic/tasks/suites_iogen.yaml deleted file mode 100644 index d45d4ea3c3f..00000000000 --- a/suites/multimds/basic/tasks/suites_iogen.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/iogen.sh diff --git a/suites/multimds/basic/tasks/suites_iozone.yaml b/suites/multimds/basic/tasks/suites_iozone.yaml deleted file mode 100644 index 9270f3c51e2..00000000000 --- a/suites/multimds/basic/tasks/suites_iozone.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/iozone.sh diff --git a/suites/multimds/basic/tasks/suites_pjd.yaml b/suites/multimds/basic/tasks/suites_pjd.yaml deleted file mode 100644 index 7cb0b0f6e6b..00000000000 --- a/suites/multimds/basic/tasks/suites_pjd.yaml +++ /dev/null @@ -1,16 +0,0 @@ -overrides: - ceph: - conf: - client: - debug ms: 1 - debug client: 20 - fuse set user groups: true - fuse default permissions: false - mds: - debug ms: 1 - debug mds: 20 -tasks: -- workunit: - clients: - all: - - suites/pjd.sh diff --git a/suites/multimds/basic/tasks/suites_truncate_delay.yaml b/suites/multimds/basic/tasks/suites_truncate_delay.yaml deleted file mode 100644 index ac5c9b13901..00000000000 --- a/suites/multimds/basic/tasks/suites_truncate_delay.yaml +++ /dev/null @@ -1,14 +0,0 @@ -overrides: - ceph: - conf: - client: - ms_inject_delay_probability: 1 - ms_inject_delay_type: osd - ms_inject_delay_max: 5 - client_oc_max_dirty_age: 1 -tasks: -- exec: - client.0: - - dd if=/dev/zero of=./foo count=100 - - sleep 2 - - truncate --size 0 ./foo diff --git a/suites/multimds/basic/tasks/trivial_sync.yaml b/suites/multimds/basic/tasks/trivial_sync.yaml deleted file mode 100644 index 36e7411b638..00000000000 --- a/suites/multimds/basic/tasks/trivial_sync.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- workunit: - clients: - all: [fs/misc/trivial_sync.sh] diff --git a/suites/multimds/libcephfs/ceph/base.yaml b/suites/multimds/libcephfs/ceph/base.yaml deleted file mode 100644 index 50b60b5152b..00000000000 --- a/suites/multimds/libcephfs/ceph/base.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- install: -- ceph: - conf: - client: - fuse_default_permissions: 0 diff --git a/suites/multimds/libcephfs/clusters/3-mds.yaml b/suites/multimds/libcephfs/clusters/3-mds.yaml deleted file mode 100644 index 1f46e7f66ac..00000000000 --- a/suites/multimds/libcephfs/clusters/3-mds.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2] -- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5, client.0] - diff --git a/suites/multimds/libcephfs/debug/mds_client.yaml b/suites/multimds/libcephfs/debug/mds_client.yaml deleted file mode 120000 index 335c1cafed7..00000000000 --- a/suites/multimds/libcephfs/debug/mds_client.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../debug/mds_client.yaml \ No newline at end of file diff --git a/suites/multimds/libcephfs/fs/xfs.yaml b/suites/multimds/libcephfs/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b..00000000000 --- a/suites/multimds/libcephfs/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/multimds/libcephfs/inline/yes.yaml b/suites/multimds/libcephfs/inline/yes.yaml deleted file mode 100644 index ae5222f6bcb..00000000000 --- a/suites/multimds/libcephfs/inline/yes.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- exec: - client.0: - - sudo ceph mds set inline_data true --yes-i-really-mean-it diff --git a/suites/multimds/libcephfs/overrides/whitelist_wrongly_marked_down.yaml b/suites/multimds/libcephfs/overrides/whitelist_wrongly_marked_down.yaml deleted file mode 120000 index 08f746bf894..00000000000 --- a/suites/multimds/libcephfs/overrides/whitelist_wrongly_marked_down.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../overrides/whitelist_wrongly_marked_down.yaml \ No newline at end of file diff --git a/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml b/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml deleted file mode 100644 index 8c6659f93df..00000000000 --- a/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml +++ /dev/null @@ -1,9 +0,0 @@ -overrides: - ceph-fuse: - disabled: true -tasks: -- ceph-fuse: -- workunit: - clients: - client.0: - - libcephfs/test.sh diff --git a/suites/multimds/libcephfs/tasks/libcephfs_java.yaml b/suites/multimds/libcephfs/tasks/libcephfs_java.yaml deleted file mode 100644 index 4bb7acefe80..00000000000 --- a/suites/multimds/libcephfs/tasks/libcephfs_java.yaml +++ /dev/null @@ -1,9 +0,0 @@ -overrides: - ceph-fuse: - disabled: true -tasks: -- ceph-fuse: -- workunit: - clients: - client.0: - - libcephfs-java/test.sh diff --git a/suites/multimds/libcephfs/tasks/mds_creation_retry.yaml b/suites/multimds/libcephfs/tasks/mds_creation_retry.yaml deleted file mode 100644 index cd87f28ad08..00000000000 --- a/suites/multimds/libcephfs/tasks/mds_creation_retry.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: --mds_creation_failure: --ceph-fuse: -- workunit: - clients: - all: [fs/misc/trivial_sync.sh] diff --git a/suites/multimds/verify/begin.yaml b/suites/multimds/verify/begin.yaml new file mode 120000 index 00000000000..a199d468d16 --- /dev/null +++ b/suites/multimds/verify/begin.yaml @@ -0,0 +1 @@ +../../fs/verify/begin.yaml \ No newline at end of file diff --git a/suites/multimds/verify/ceph/base.yaml b/suites/multimds/verify/ceph/base.yaml deleted file mode 100644 index 50b60b5152b..00000000000 --- a/suites/multimds/verify/ceph/base.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- install: -- ceph: - conf: - client: - fuse_default_permissions: 0 diff --git a/suites/multimds/verify/clusters/3-mds.yaml b/suites/multimds/verify/clusters/3-mds.yaml deleted file mode 100644 index 7ebdeba3649..00000000000 --- a/suites/multimds/verify/clusters/3-mds.yaml +++ /dev/null @@ -1,3 +0,0 @@ -roles: -- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2] -- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5, client.0] diff --git a/suites/multimds/verify/clusters/3-mds.yaml b/suites/multimds/verify/clusters/3-mds.yaml new file mode 120000 index 00000000000..97d5edc6011 --- /dev/null +++ b/suites/multimds/verify/clusters/3-mds.yaml @@ -0,0 +1 @@ +../../../../cephfs/clusters/3-mds.yaml \ No newline at end of file diff --git a/suites/multimds/verify/clusters/9-mds.yaml b/suites/multimds/verify/clusters/9-mds.yaml deleted file mode 100644 index 252a63e49d1..00000000000 --- a/suites/multimds/verify/clusters/9-mds.yaml +++ /dev/null @@ -1,3 +0,0 @@ -roles: -- [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2] -- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5, client.0] diff --git a/suites/multimds/verify/clusters/9-mds.yaml b/suites/multimds/verify/clusters/9-mds.yaml new file mode 120000 index 00000000000..c5222943220 --- /dev/null +++ b/suites/multimds/verify/clusters/9-mds.yaml @@ -0,0 +1 @@ +../../../../cephfs/clusters/9-mds.yaml \ No newline at end of file diff --git a/suites/multimds/verify/debug/mds_client.yaml b/suites/multimds/verify/debug/mds_client.yaml deleted file mode 120000 index 335c1cafed7..00000000000 --- a/suites/multimds/verify/debug/mds_client.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../debug/mds_client.yaml \ No newline at end of file diff --git a/suites/multimds/verify/fs b/suites/multimds/verify/fs new file mode 120000 index 00000000000..3d1f584bb7a --- /dev/null +++ b/suites/multimds/verify/fs @@ -0,0 +1 @@ +../../fs/verify/fs/ \ No newline at end of file diff --git a/suites/multimds/verify/fs/xfs.yaml b/suites/multimds/verify/fs/xfs.yaml deleted file mode 120000 index 4c28d731f6b..00000000000 --- a/suites/multimds/verify/fs/xfs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../fs/xfs.yaml \ No newline at end of file diff --git a/suites/multimds/verify/mount/fuse.yaml b/suites/multimds/verify/mount/fuse.yaml new file mode 120000 index 00000000000..af9ee0ab798 --- /dev/null +++ b/suites/multimds/verify/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/multimds/verify/mount/kclient.yaml b/suites/multimds/verify/mount/kclient.yaml new file mode 120000 index 00000000000..b6f2aad4a0f --- /dev/null +++ b/suites/multimds/verify/mount/kclient.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/kclient.yaml \ No newline at end of file diff --git a/suites/multimds/libcephfs/inline/no.yaml b/suites/multimds/verify/overrides/% similarity index 100% rename from suites/multimds/libcephfs/inline/no.yaml rename to suites/multimds/verify/overrides/% diff --git a/suites/multimds/verify/overrides/fuse-default-perm-no.yaml b/suites/multimds/verify/overrides/fuse-default-perm-no.yaml new file mode 120000 index 00000000000..1bada5b5acb --- /dev/null +++ b/suites/multimds/verify/overrides/fuse-default-perm-no.yaml @@ -0,0 +1 @@ +../../../../cephfs/overrides/fuse/default-perm/no.yaml \ No newline at end of file diff --git a/suites/multimds/verify/overrides/verify b/suites/multimds/verify/overrides/verify new file mode 120000 index 00000000000..3ded92ed2f0 --- /dev/null +++ b/suites/multimds/verify/overrides/verify @@ -0,0 +1 @@ +../../../fs/verify/overrides/ \ No newline at end of file diff --git a/suites/multimds/verify/overrides/whitelist_wrongly_marked_down.yaml b/suites/multimds/verify/overrides/whitelist_wrongly_marked_down.yaml deleted file mode 120000 index 08f746bf894..00000000000 --- a/suites/multimds/verify/overrides/whitelist_wrongly_marked_down.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../overrides/whitelist_wrongly_marked_down.yaml \ No newline at end of file diff --git a/suites/multimds/verify/tasks b/suites/multimds/verify/tasks new file mode 120000 index 00000000000..f0edfbd4d80 --- /dev/null +++ b/suites/multimds/verify/tasks @@ -0,0 +1 @@ +../../fs/verify/tasks/ \ No newline at end of file diff --git a/suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml b/suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml deleted file mode 100644 index ad96b4c5e7f..00000000000 --- a/suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - suites/dbench.sh diff --git a/suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml deleted file mode 100644 index 5908d951b2d..00000000000 --- a/suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - suites/fsstress.sh diff --git a/suites/multimds/verify/tasks/libcephfs_interface_tests.yaml b/suites/multimds/verify/tasks/libcephfs_interface_tests.yaml deleted file mode 100644 index 0b1d41fea5c..00000000000 --- a/suites/multimds/verify/tasks/libcephfs_interface_tests.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - client.0: - - libcephfs/test.sh diff --git a/suites/multimds/verify/validater b/suites/multimds/verify/validater new file mode 120000 index 00000000000..0c7f8a50de4 --- /dev/null +++ b/suites/multimds/verify/validater @@ -0,0 +1 @@ +../../fs/verify/validater/ \ No newline at end of file diff --git a/suites/multimds/verify/validater/lockdep.yaml b/suites/multimds/verify/validater/lockdep.yaml deleted file mode 100644 index 25f84355c0b..00000000000 --- a/suites/multimds/verify/validater/lockdep.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - ceph: - conf: - global: - lockdep: true diff --git a/suites/multimds/verify/validater/valgrind.yaml b/suites/multimds/verify/validater/valgrind.yaml deleted file mode 100644 index ba660c5f739..00000000000 --- a/suites/multimds/verify/validater/valgrind.yaml +++ /dev/null @@ -1,17 +0,0 @@ -os_type: centos # xenial valgrind buggy, see http://tracker.ceph.com/issues/18126 -overrides: - install: - ceph: - flavor: notcmalloc - debuginfo: true - ceph: - conf: - global: - osd heartbeat grace: 40 - valgrind: - mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes] - osd: [--tool=memcheck] - mds: [--tool=memcheck] - ceph-fuse: - client.0: - valgrind: [--tool=memcheck, --leak-check=full, --show-reachable=yes] -- 2.39.5