From: Sage Weil Date: Wed, 2 Apr 2014 14:16:49 +0000 (-0700) Subject: multimds: test ceph-fuse and kclient X-Git-Tag: v0.94.10~27^2^2~431 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=552f9d8dee3d10a4c48945377e4bf6c92ab22d13;p=ceph.git multimds: test ceph-fuse and kclient Add client as a variable on the basic collection. Move the other stuff (libcephfs plus a weird restart test) to libcephfs collection. Signed-off-by: Sage Weil --- diff --git a/suites/multimds/basic/mount/cfuse.yaml b/suites/multimds/basic/mount/cfuse.yaml new file mode 100644 index 000000000000..e3c34a1f6046 --- /dev/null +++ b/suites/multimds/basic/mount/cfuse.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph-fuse: diff --git a/suites/multimds/basic/mount/kclient.yaml b/suites/multimds/basic/mount/kclient.yaml new file mode 100644 index 000000000000..c9a1f5b6f235 --- /dev/null +++ b/suites/multimds/basic/mount/kclient.yaml @@ -0,0 +1,2 @@ +tasks: +- kclient: diff --git a/suites/multimds/basic/tasks/cfuse_workunit_kernel_untar_build.yaml b/suites/multimds/basic/tasks/cfuse_workunit_kernel_untar_build.yaml deleted file mode 100644 index fcc52912963a..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_kernel_untar_build.yaml +++ /dev/null @@ -1,11 +0,0 @@ -overrides: - ceph: - conf: - client: - fuse_default_permissions: 0 -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - kernel_untar_build.sh diff --git a/suites/multimds/basic/tasks/cfuse_workunit_misc.yaml b/suites/multimds/basic/tasks/cfuse_workunit_misc.yaml deleted file mode 100644 index be3f1331990e..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_misc.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - fs/misc diff --git a/suites/multimds/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml b/suites/multimds/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml deleted file mode 100644 index c9720a2fd488..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - fs/test_o_trunc.sh diff --git a/suites/multimds/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_blogbench.yaml deleted file mode 100644 index 09898e16bda4..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_suites_blogbench.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - suites/blogbench.sh diff --git a/suites/multimds/basic/tasks/cfuse_workunit_suites_dbench.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_dbench.yaml deleted file mode 100644 index ad96b4c5e7fc..000000000000 --- a/suites/multimds/basic/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/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_ffsb.yaml deleted file mode 100644 index 860081600349..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_suites_ffsb.yaml +++ /dev/null @@ -1,11 +0,0 @@ -overrides: - ceph: - conf: - osd: - filestore flush min: 0 -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - suites/ffsb.sh diff --git a/suites/multimds/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_fsstress.yaml deleted file mode 100644 index 5908d951b2df..000000000000 --- a/suites/multimds/basic/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/basic/tasks/cfuse_workunit_suites_fsx.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_fsx.yaml deleted file mode 100644 index 3c11ed74fc72..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_suites_fsx.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - suites/fsx.sh diff --git a/suites/multimds/basic/tasks/cfuse_workunit_suites_fsync.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_fsync.yaml deleted file mode 100644 index c6043e209bd4..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_suites_fsync.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - suites/fsync-tester.sh diff --git a/suites/multimds/basic/tasks/cfuse_workunit_suites_iogen.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_iogen.yaml deleted file mode 100644 index 6989990e22aa..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_suites_iogen.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - suites/iogen.sh - diff --git a/suites/multimds/basic/tasks/cfuse_workunit_suites_iozone.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_iozone.yaml deleted file mode 100644 index 1e23f670e289..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_suites_iozone.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: [client.0] -- workunit: - clients: - all: - - suites/iozone.sh diff --git a/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml deleted file mode 100644 index 65bcd0d03331..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml +++ /dev/null @@ -1,15 +0,0 @@ -overrides: - ceph: - conf: - client: - debug ms: 1 - debug client: 20 - mds: - debug ms: 1 - debug mds: 20 -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - suites/pjd.sh diff --git a/suites/multimds/basic/tasks/cfuse_workunit_suites_tiobench.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_tiobench.yaml deleted file mode 100644 index f0b6f829b6db..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_suites_tiobench.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - all: - - suites/tiobench.sh diff --git a/suites/multimds/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml b/suites/multimds/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml deleted file mode 100644 index f3efafa2e9da..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml +++ /dev/null @@ -1,15 +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: -- ceph-fuse: -- exec: - client.0: - - dd if=/dev/zero of=./foo count=100 - - sleep 2 - - truncate --size 0 ./foo diff --git a/suites/multimds/basic/tasks/cfuse_workunit_trivial_sync.yaml b/suites/multimds/basic/tasks/cfuse_workunit_trivial_sync.yaml deleted file mode 100644 index 9509650c76c0..000000000000 --- a/suites/multimds/basic/tasks/cfuse_workunit_trivial_sync.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- ceph-fuse: -- workunit: - clients: - all: [fs/misc/trivial_sync.sh] diff --git a/suites/multimds/basic/tasks/kernel_untar_build.yaml b/suites/multimds/basic/tasks/kernel_untar_build.yaml new file mode 100644 index 000000000000..8dbc24a9febf --- /dev/null +++ b/suites/multimds/basic/tasks/kernel_untar_build.yaml @@ -0,0 +1,10 @@ +overrides: + ceph: + conf: + client: + fuse_default_permissions: 0 +tasks: +- workunit: + clients: + all: + - kernel_untar_build.sh diff --git a/suites/multimds/basic/tasks/libcephfs_interface_tests.yaml b/suites/multimds/basic/tasks/libcephfs_interface_tests.yaml deleted file mode 100644 index 0b1d41fea5c4..000000000000 --- a/suites/multimds/basic/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/basic/tasks/libcephfs_java.yaml b/suites/multimds/basic/tasks/libcephfs_java.yaml deleted file mode 100644 index 5d6bb00048fc..000000000000 --- a/suites/multimds/basic/tasks/libcephfs_java.yaml +++ /dev/null @@ -1,10 +0,0 @@ -overrides: - install: - ceph: - extra_packages: [libcephfs1, libcephfs-java, libcephfs-jni] -tasks: -- ceph-fuse: -- workunit: - clients: - client.0: - - libcephfs-java/test.sh diff --git a/suites/multimds/basic/tasks/mds_creation_retry.yaml b/suites/multimds/basic/tasks/mds_creation_retry.yaml deleted file mode 100644 index 76ceeafa8e77..000000000000 --- a/suites/multimds/basic/tasks/mds_creation_retry.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: --mds_creation_failure: --ceph-fuse: -- workunit: - clients: - all: [fs/misc/trivial_sync.sh] - diff --git a/suites/multimds/basic/tasks/misc.yaml b/suites/multimds/basic/tasks/misc.yaml new file mode 100644 index 000000000000..aa62b9e8c3ad --- /dev/null +++ b/suites/multimds/basic/tasks/misc.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + 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 new file mode 100644 index 000000000000..c9de5c386377 --- /dev/null +++ b/suites/multimds/basic/tasks/misc_test_o_trunc.yaml @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000000..4c1fcc11ed90 --- /dev/null +++ b/suites/multimds/basic/tasks/suites_blogbench.yaml @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000000..41b2bc8edaab --- /dev/null +++ b/suites/multimds/basic/tasks/suites_dbench.yaml @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000000..4a2a627fe5d3 --- /dev/null +++ b/suites/multimds/basic/tasks/suites_ffsb.yaml @@ -0,0 +1,10 @@ +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 new file mode 100644 index 000000000000..ddb18fb791aa --- /dev/null +++ b/suites/multimds/basic/tasks/suites_fsstress.yaml @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000000..8b2b1ab5c141 --- /dev/null +++ b/suites/multimds/basic/tasks/suites_fsx.yaml @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000000..7efa1adb82da --- /dev/null +++ b/suites/multimds/basic/tasks/suites_fsync.yaml @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000000..d45d4ea3c3fc --- /dev/null +++ b/suites/multimds/basic/tasks/suites_iogen.yaml @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000000..9270f3c51e22 --- /dev/null +++ b/suites/multimds/basic/tasks/suites_iozone.yaml @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000000..de21f7c34640 --- /dev/null +++ b/suites/multimds/basic/tasks/suites_pjd.yaml @@ -0,0 +1,14 @@ +overrides: + ceph: + conf: + client: + debug ms: 1 + debug client: 20 + mds: + debug ms: 1 + debug mds: 20 +tasks: +- workunit: + clients: + all: + - suites/pjd.sh diff --git a/suites/multimds/basic/tasks/suites_tiobench.yaml b/suites/multimds/basic/tasks/suites_tiobench.yaml new file mode 100644 index 000000000000..4850a04e0cff --- /dev/null +++ b/suites/multimds/basic/tasks/suites_tiobench.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + all: + - suites/tiobench.sh diff --git a/suites/multimds/basic/tasks/suites_truncate_delay.yaml b/suites/multimds/basic/tasks/suites_truncate_delay.yaml new file mode 100644 index 000000000000..ac5c9b139015 --- /dev/null +++ b/suites/multimds/basic/tasks/suites_truncate_delay.yaml @@ -0,0 +1,14 @@ +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 new file mode 100644 index 000000000000..36e7411b6385 --- /dev/null +++ b/suites/multimds/basic/tasks/trivial_sync.yaml @@ -0,0 +1,4 @@ +tasks: +- workunit: + clients: + all: [fs/misc/trivial_sync.sh] diff --git a/suites/multimds/libcephfs/% b/suites/multimds/libcephfs/% new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/suites/multimds/libcephfs/clusters/3-mds.yaml b/suites/multimds/libcephfs/clusters/3-mds.yaml new file mode 100644 index 000000000000..c655b90c81cd --- /dev/null +++ b/suites/multimds/libcephfs/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/suites/multimds/libcephfs/clusters/9-mds.yaml new file mode 100644 index 000000000000..ed554c9fe3c7 --- /dev/null +++ b/suites/multimds/libcephfs/clusters/9-mds.yaml @@ -0,0 +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] diff --git a/suites/multimds/libcephfs/debug/mds_client.yaml b/suites/multimds/libcephfs/debug/mds_client.yaml new file mode 120000 index 000000000000..335c1cafed75 --- /dev/null +++ b/suites/multimds/libcephfs/debug/mds_client.yaml @@ -0,0 +1 @@ +../../../../debug/mds_client.yaml \ No newline at end of file diff --git a/suites/multimds/libcephfs/fs/btrfs.yaml b/suites/multimds/libcephfs/fs/btrfs.yaml new file mode 120000 index 000000000000..10d0c3f1266e --- /dev/null +++ b/suites/multimds/libcephfs/fs/btrfs.yaml @@ -0,0 +1 @@ +../../../../fs/btrfs.yaml \ No newline at end of file diff --git a/suites/multimds/libcephfs/inline/no.yaml b/suites/multimds/libcephfs/inline/no.yaml new file mode 100644 index 000000000000..2030acb90836 --- /dev/null +++ b/suites/multimds/libcephfs/inline/no.yaml @@ -0,0 +1,3 @@ +tasks: +- install: +- ceph: diff --git a/suites/multimds/libcephfs/inline/yes.yaml b/suites/multimds/libcephfs/inline/yes.yaml new file mode 100644 index 000000000000..72a285c590fb --- /dev/null +++ b/suites/multimds/libcephfs/inline/yes.yaml @@ -0,0 +1,6 @@ +tasks: +- install: +- ceph: +- exec: + client.0: + - 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 new file mode 120000 index 000000000000..08f746bf8943 --- /dev/null +++ b/suites/multimds/libcephfs/overrides/whitelist_wrongly_marked_down.yaml @@ -0,0 +1 @@ +../../../../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 new file mode 100644 index 000000000000..0b1d41fea5c4 --- /dev/null +++ b/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml @@ -0,0 +1,6 @@ +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 new file mode 100644 index 000000000000..5d6bb00048fc --- /dev/null +++ b/suites/multimds/libcephfs/tasks/libcephfs_java.yaml @@ -0,0 +1,10 @@ +overrides: + install: + ceph: + extra_packages: [libcephfs1, libcephfs-java, libcephfs-jni] +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 new file mode 100644 index 000000000000..cd87f28ad08d --- /dev/null +++ b/suites/multimds/libcephfs/tasks/mds_creation_retry.yaml @@ -0,0 +1,6 @@ +tasks: +-mds_creation_failure: +-ceph-fuse: +- workunit: + clients: + all: [fs/misc/trivial_sync.sh]