From 3a951df724c1ca1432a23964162dca4086839d74 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 6 Mar 2013 21:43:24 -0800 Subject: [PATCH] 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 --- suites/marginal/osd_powercycle/powercycle/default.yaml | 2 ++ .../tasks/cfuse_workunit_kernel_untar_build.yaml | 2 -- .../osd_powercycle/tasks/cfuse_workunit_misc.yaml | 2 -- .../tasks/cfuse_workunit_suites_blogbench.yaml | 2 -- .../tasks/cfuse_workunit_suites_dbench.yaml | 2 -- .../osd_powercycle/tasks/cfuse_workunit_suites_ffsb.yaml | 2 -- .../tasks/cfuse_workunit_suites_fsstress.yaml | 2 -- .../osd_powercycle/tasks/cfuse_workunit_suites_fsx.yaml | 2 -- .../tasks/cfuse_workunit_suites_fsync.yaml | 2 -- .../tasks/cfuse_workunit_suites_iozone.yaml | 4 +--- .../osd_powercycle/tasks/cfuse_workunit_suites_pjd.yaml | 9 --------- .../tasks/cfuse_workunit_suites_tiobench.yaml | 2 -- .../tasks/cfuse_workunit_suites_truncate_delay.yaml | 6 +++--- .../tasks/cfuse_workunit_trivial_sync.yaml | 2 -- 14 files changed, 6 insertions(+), 35 deletions(-) diff --git a/suites/marginal/osd_powercycle/powercycle/default.yaml b/suites/marginal/osd_powercycle/powercycle/default.yaml index f3368af5c0b77..35c5196e38ed8 100644 --- 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 b44bcea8dc198..3e99204debb72 100644 --- 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 84dbe5db3cf83..792eeb2c31efe 100644 --- 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 ed9d92d5bda1e..09898e16bda4e 100644 --- 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 e678ed47cc676..ad96b4c5e7fcf 100644 --- 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 00c9937f679a4..2a0bc26a1cf4b 100644 --- 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 b58487c078532..5908d951b2df0 100644 --- 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 9b0c6149251b2..3c11ed74fc728 100644 --- 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 c1cd14c8f49c8..c6043e209bd45 100644 --- 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 dc6df2f709fbc..18a6051be39eb 100644 --- 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 b3ebffb2cf75d..930bf4a671d41 100644 --- 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 d819e47b9cf3f..f0b6f829b6db8 100644 --- 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 3aa5f8825ac28..f3efafa2e9dad 100644 --- 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 1515491a736e7..cd729e0f69600 100644 --- 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: -- 2.39.5