From 021d94caaca113a4cb4000e176e917763c4594e8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 2 Feb 2014 12:03:23 -0800 Subject: [PATCH] fs/basic: test with inline data Signed-off-by: Sage Weil --- suites/fs/basic/inline/no.yaml | 3 +++ suites/fs/basic/inline/yes.yaml | 6 ++++++ .../fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml | 2 -- suites/fs/basic/tasks/cfuse_workunit_misc.yaml | 2 -- suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml | 2 -- suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml | 2 -- suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml | 2 -- suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml | 6 +++--- suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml | 2 -- suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml | 2 -- suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml | 2 -- suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml | 2 -- suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml | 2 -- suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml | 6 +++--- suites/fs/basic/tasks/cfuse_workunit_suites_tiobench.yaml | 2 -- .../basic/tasks/cfuse_workunit_suites_truncate_delay.yaml | 6 +++--- suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml | 2 -- suites/fs/basic/tasks/libcephfs_interface_tests.yaml | 2 -- suites/fs/basic/tasks/libcephfs_java.yaml | 3 --- 19 files changed, 18 insertions(+), 38 deletions(-) create mode 100644 suites/fs/basic/inline/no.yaml create mode 100644 suites/fs/basic/inline/yes.yaml diff --git a/suites/fs/basic/inline/no.yaml b/suites/fs/basic/inline/no.yaml new file mode 100644 index 0000000000000..2030acb90836c --- /dev/null +++ b/suites/fs/basic/inline/no.yaml @@ -0,0 +1,3 @@ +tasks: +- install: +- ceph: diff --git a/suites/fs/basic/inline/yes.yaml b/suites/fs/basic/inline/yes.yaml new file mode 100644 index 0000000000000..efd83d6b077a7 --- /dev/null +++ b/suites/fs/basic/inline/yes.yaml @@ -0,0 +1,6 @@ +tasks: +- install: +- ceph: +- exec: + client.0: + - ceph mds set inline_data --yes-i-really-mean-it diff --git a/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml b/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml index b44bcea8dc198..3e99204debb72 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_misc.yaml b/suites/fs/basic/tasks/cfuse_workunit_misc.yaml index 84dbe5db3cf83..792eeb2c31efe 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_misc.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_misc.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml b/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml index 5afb84d66ac6e..c9720a2fd488f 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml index ed9d92d5bda1e..09898e16bda4e 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml index e678ed47cc676..ad96b4c5e7fcf 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml index 652a3a62f592b..8600816003499 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml @@ -1,9 +1,9 @@ -tasks: -- install: -- ceph: +overrides: + ceph: conf: osd: filestore flush min: 0 +tasks: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml index b58487c078532..5908d951b2df0 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml index 9b0c6149251b2..3c11ed74fc728 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml index c1cd14c8f49c8..c6043e209bd45 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml index 8221c44b20441..6989990e22aa7 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml index dc6df2f709fbc..1e23f670e2894 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: [client.0] - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml index b3ebffb2cf75d..65bcd0d033316 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml @@ -1,6 +1,5 @@ -tasks: -- install: -- ceph: +overrides: + ceph: conf: client: debug ms: 1 @@ -8,6 +7,7 @@ tasks: mds: debug ms: 1 debug mds: 20 +tasks: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_tiobench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_tiobench.yaml index d819e47b9cf3f..f0b6f829b6db8 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_tiobench.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_tiobench.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml index 3aa5f8825ac28..f3efafa2e9dad 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml @@ -1,12 +1,12 @@ -tasks: -- install: -- ceph: +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: diff --git a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml index 1515491a736e7..cd729e0f69600 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml index 22d1f14216168..0b1d41fea5c44 100644 --- a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml +++ b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: diff --git a/suites/fs/basic/tasks/libcephfs_java.yaml b/suites/fs/basic/tasks/libcephfs_java.yaml index b391ae6d25644..5d6bb00048fc4 100644 --- a/suites/fs/basic/tasks/libcephfs_java.yaml +++ b/suites/fs/basic/tasks/libcephfs_java.yaml @@ -2,10 +2,7 @@ overrides: install: ceph: extra_packages: [libcephfs1, libcephfs-java, libcephfs-jni] - tasks: -- install: -- ceph: - ceph-fuse: - workunit: clients: -- 2.39.5