marginal: fix mds thrasher tasks

Make the ceph cluster get installed and set up before we start thrashing
the mds.

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

diff --git a/suites/marginal/mds_thrasher/ceph-thrash/default.yaml b/suites/marginal/mds_thrasher/ceph-thrash/default.yaml
new file mode 100644 (file)
index 0000000..aefdf82
--- /dev/null
+++ b/suites/marginal/mds_thrasher/ceph-thrash/default.yaml
@@ -0,0 +1,2 @@
+tasks:
+- mds_thrash:

diff --git a/suites/marginal/mds_thrasher/ceph/base.yaml b/suites/marginal/mds_thrasher/ceph/base.yaml
new file mode 100644 (file)
index 0000000..2030acb
--- /dev/null
+++ b/suites/marginal/mds_thrasher/ceph/base.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:

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

diff --git a/suites/marginal/mds_thrasher/tasks/cfuse_workunit_trivial_sync.yaml b/suites/marginal/mds_thrasher/tasks/cfuse_workunit_trivial_sync.yaml
index 1515491a736e742358fa0db50405bc71cd9246f7..cd729e0f69600a09556c48802230bed96df36c97 100644 (file)
--- a/suites/marginal/mds_thrasher/tasks/cfuse_workunit_trivial_sync.yaml
+++ b/suites/marginal/mds_thrasher/tasks/cfuse_workunit_trivial_sync.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

diff --git a/suites/marginal/mds_thrasher/thrash/default.yaml b/suites/marginal/mds_thrasher/thrash/default.yaml
deleted file mode 100644 (file)
index aefdf82..0000000
--- a/suites/marginal/mds_thrasher/thrash/default.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- mds_thrash: