fs/basic: test with inline data

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/suites/fs/basic/inline/no.yaml b/suites/fs/basic/inline/no.yaml
new file mode 100644 (file)
index 0000000..2030acb
--- /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 (file)
index 0000000..efd83d6
--- /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 b44bcea8dc1987bf3259ca5c7e29b12944baabf8..3e99204debb729a56a89564648d5c86c3662e27b 100644 (file)
--- 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 84dbe5db3cf83479924fde041719a35393cbdcd6..792eeb2c31efec30ef9923ae4ccf476a396256f4 100644 (file)
--- 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 5afb84d66ac6e6e50c631225bd1c86a7537a20ca..c9720a2fd488f9257ed811648333ef108ecabb8b 100644 (file)
--- 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 ed9d92d5bda1e4307bfa27d0fc4e0bf4032a178e..09898e16bda4e9055b4f8c9f65356f8f00c7213a 100644 (file)
--- 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 e678ed47cc676cd1f9bba2cf97fa9c6cd05a3b59..ad96b4c5e7fcfe50492affcd7ca05f528dda3721 100644 (file)
--- 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 652a3a62f592b5c756fed852bb99057eeb3c94d8..8600816003499db7d8b3bdfb2cc5ef2c7d66168a 100644 (file)
--- 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 b58487c0785328ab40782180a534b057e68edff9..5908d951b2df0add0792c67e8db89d9e9abc15a0 100644 (file)
--- 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 9b0c6149251b258d499725d8bf97e57b3fa63229..3c11ed74fc72819fa902a495f874574d3142c0c4 100644 (file)
--- 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 c1cd14c8f49c8d133275af44b0584ef6a3003a30..c6043e209bd453e693e6d3a967a8e6f9a210a22c 100644 (file)
--- 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 8221c44b20441b97f830710fdf208ab717710f7f..6989990e22aa713894d717dd8e60ee8a8a1495a0 100644 (file)
--- 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 dc6df2f709fbcb15498f8b37063669e10f73022f..1e23f670e28944a22acf165349acc5624df5d6b3 100644 (file)
--- 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 b3ebffb2cf75d09c93efc84d16debc845e597477..65bcd0d033316d1a0fa0eb8fd00b4cb75f4d847c 100644 (file)
--- 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 d819e47b9cf3f5557956d8d98ada46fdd5877a88..f0b6f829b6db8915bce716d5ba7ea0605bcd5104 100644 (file)
--- 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 3aa5f8825ac281c181acce6d02a7136c533bc410..f3efafa2e9dadaf7307f7032591fc7450e4e13a2 100644 (file)
--- 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 1515491a736e742358fa0db50405bc71cd9246f7..cd729e0f69600a09556c48802230bed96df36c97 100644 (file)
--- 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 22d1f1421616822236fe4ad54491da548feb01e4..0b1d41fea5c444e51203829976e0ce8f163b4d27 100644 (file)
--- 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 b391ae6d256441cb034bd2f182896f3b5acdf0a4..5d6bb00048fc4f26eadbab4fec11fe18fdc5dcb2 100644 (file)
--- 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: