From: Sage Weil <sage@inktank.com>
Date: Fri, 8 Mar 2013 23:13:42 +0000 (-0800)
Subject: fs: move mds thrashing from marginal, add pjd task
X-Git-Tag: v0.94.10~27^2^2~778
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53cf1f1317dc643159bc21a7978c9c6d66ee7224;p=ceph.git

fs: move mds thrashing from marginal, add pjd task

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

diff --git a/suites/fs/thrash/ceph-thrash/default.yaml b/suites/fs/thrash/ceph-thrash/default.yaml
new file mode 100644
index 00000000000..aefdf826ce7
--- /dev/null
+++ b/suites/fs/thrash/ceph-thrash/default.yaml
@@ -0,0 +1,2 @@
+tasks:
+- mds_thrash:
diff --git a/suites/fs/thrash/ceph/base.yaml b/suites/fs/thrash/ceph/base.yaml
new file mode 100644
index 00000000000..2030acb9083
--- /dev/null
+++ b/suites/fs/thrash/ceph/base.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:
diff --git a/suites/fs/thrash/clusters/mds-1active-1standby.yaml b/suites/fs/thrash/clusters/mds-1active-1standby.yaml
new file mode 100644
index 00000000000..7e951b95889
--- /dev/null
+++ b/suites/fs/thrash/clusters/mds-1active-1standby.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.c, osd.0, osd.1, osd.2]
+- [mon.b, mds.a, osd.3, osd.4, osd.5]
+- [client.0, mds.b-s-a]
diff --git a/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml
new file mode 100644
index 00000000000..5908d951b2d
--- /dev/null
+++ b/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/fsstress.sh
diff --git a/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml b/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml
new file mode 100644
index 00000000000..930bf4a671d
--- /dev/null
+++ b/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/pjd.sh
diff --git a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml
new file mode 100644
index 00000000000..cd729e0f696
--- /dev/null
+++ b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph-fuse:
+- workunit:
+    clients:
+      all: [misc/trivial_sync.sh]
diff --git a/suites/marginal/mds_thrasher/ceph-thrash/default.yaml b/suites/marginal/mds_thrasher/ceph-thrash/default.yaml
deleted file mode 100644
index aefdf826ce7..00000000000
--- a/suites/marginal/mds_thrasher/ceph-thrash/default.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- mds_thrash:
diff --git a/suites/marginal/mds_thrasher/ceph/base.yaml b/suites/marginal/mds_thrasher/ceph/base.yaml
deleted file mode 100644
index 2030acb9083..00000000000
--- a/suites/marginal/mds_thrasher/ceph/base.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph:
diff --git a/suites/marginal/mds_thrasher/clusters/mds-1active-1standby.yaml b/suites/marginal/mds_thrasher/clusters/mds-1active-1standby.yaml
deleted file mode 100644
index 7e951b95889..00000000000
--- a/suites/marginal/mds_thrasher/clusters/mds-1active-1standby.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.c, osd.0, osd.1, osd.2]
-- [mon.b, mds.a, osd.3, osd.4, osd.5]
-- [client.0, mds.b-s-a]
diff --git a/suites/marginal/mds_thrasher/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/marginal/mds_thrasher/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644
index 5908d951b2d..00000000000
--- a/suites/marginal/mds_thrasher/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.sh
diff --git a/suites/marginal/mds_thrasher/tasks/cfuse_workunit_trivial_sync.yaml b/suites/marginal/mds_thrasher/tasks/cfuse_workunit_trivial_sync.yaml
deleted file mode 100644
index cd729e0f696..00000000000
--- a/suites/marginal/mds_thrasher/tasks/cfuse_workunit_trivial_sync.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      all: [misc/trivial_sync.sh]