marginal/osd_powercycle: restructure collection

Move install and ceph into the powercycle facet, so that it comes before
the osdthrasher.  Remove it from all of the tasks.

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

diff --git a/suites/marginal/osd_powercycle/powercycle/default.yaml b/suites/marginal/osd_powercycle/powercycle/default.yaml
index f3368af5c0b77e2cd5950d44e98b7a8ba8940226..35c5196e38ed86b3b23365771daa4db3450d1536 100644 (file)
--- a/suites/marginal/osd_powercycle/powercycle/default.yaml
+++ b/suites/marginal/osd_powercycle/powercycle/default.yaml
@@ -1,4 +1,6 @@
 tasks:
+- install:
+- ceph:
 - thrashosds:
     chance_down: 1.0
     powercycle: true

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_kernel_untar_build.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_kernel_untar_build.yaml
index b44bcea8dc1987bf3259ca5c7e29b12944baabf8..3e99204debb729a56a89564648d5c86c3662e27b 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_kernel_untar_build.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_kernel_untar_build.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_misc.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_misc.yaml
index 84dbe5db3cf83479924fde041719a35393cbdcd6..792eeb2c31efec30ef9923ae4ccf476a396256f4 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_misc.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_misc.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_blogbench.yaml
index ed9d92d5bda1e4307bfa27d0fc4e0bf4032a178e..09898e16bda4e9055b4f8c9f65356f8f00c7213a 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_blogbench.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_dbench.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_dbench.yaml
index e678ed47cc676cd1f9bba2cf97fa9c6cd05a3b59..ad96b4c5e7fcfe50492affcd7ca05f528dda3721 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_dbench.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_dbench.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_ffsb.yaml
index 00c9937f679a4e9393e4f9446b69710271155b71..2a0bc26a1cf4bcc06540e21c61dcbfa5254cde72 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_ffsb.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsstress.yaml
index b58487c0785328ab40782180a534b057e68edff9..5908d951b2df0add0792c67e8db89d9e9abc15a0 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsstress.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsx.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsx.yaml
index 9b0c6149251b258d499725d8bf97e57b3fa63229..3c11ed74fc72819fa902a495f874574d3142c0c4 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsx.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsx.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsync.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsync.yaml
index c1cd14c8f49c8d133275af44b0584ef6a3003a30..c6043e209bd453e693e6d3a967a8e6f9a210a22c 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsync.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_fsync.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_iozone.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_iozone.yaml
index dc6df2f709fbcb15498f8b37063669e10f73022f..18a6051be39eb54237813fe04af23fe9ffeba411 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_iozone.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_iozone.yaml
@@ -1,7 +1,5 @@
 tasks:
-- install:
-- ceph:
-- ceph-fuse: [client.0]
+- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_pjd.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_pjd.yaml
index b3ebffb2cf75d09c93efc84d16debc845e597477..930bf4a671d41fad490d526659b5adb20c07027f 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_pjd.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_pjd.yaml
@@ -1,13 +1,4 @@
 tasks:
-- install:
-- ceph:
-    conf:
-      client:
-        debug ms: 1
-        debug client: 20
-      mds:
-        debug ms: 1
-        debug mds: 20
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_tiobench.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_tiobench.yaml
index d819e47b9cf3f5557956d8d98ada46fdd5877a88..f0b6f829b6db8915bce716d5ba7ea0605bcd5104 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_tiobench.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_tiobench.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_truncate_delay.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_truncate_delay.yaml
index 3aa5f8825ac281c181acce6d02a7136c533bc410..f3efafa2e9dadaf7307f7032591fc7450e4e13a2 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_suites_truncate_delay.yaml
+++ b/suites/marginal/osd_powercycle/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/marginal/osd_powercycle/tasks/cfuse_workunit_trivial_sync.yaml b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_trivial_sync.yaml
index 1515491a736e742358fa0db50405bc71cd9246f7..cd729e0f69600a09556c48802230bed96df36c97 100644 (file)
--- a/suites/marginal/osd_powercycle/tasks/cfuse_workunit_trivial_sync.yaml
+++ b/suites/marginal/osd_powercycle/tasks/cfuse_workunit_trivial_sync.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients: