marginal: restructure the multimds collection

- two clients types (ceph-fuse and kclient)
- two clients in each test
- separate out tasks

diff --git a/suites/marginal/multimds/clusters/3-node-3-mds.yaml b/suites/marginal/multimds/clusters/3-node-3-mds.yaml
index 916018b6e43834f6aa22386950c150bc5b370f59..088d9f0d31d2043f1739ed4a8989ca5085973622 100644 (file)
--- a/suites/marginal/multimds/clusters/3-node-3-mds.yaml
+++ b/suites/marginal/multimds/clusters/3-node-3-mds.yaml
@@ -1,4 +1,5 @@
 roles:
-- [mon.a, mon.c, mds.b, osd.0, osd.1, osd.2]
-- [mon.b, mds.a, mds.c, osd.3, osd.4, osd.5]
+- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2]
+- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5]
 - [client.0]
+- [client.1]

diff --git a/suites/marginal/multimds/clusters/3-node-9-mds.yaml b/suites/marginal/multimds/clusters/3-node-9-mds.yaml
index ab53a65713533dcd16fbb43e83f7dc0d8507a72f..be824f0f5542f91f4c6e1949e91c9483fa57dc2b 100644 (file)
--- a/suites/marginal/multimds/clusters/3-node-9-mds.yaml
+++ b/suites/marginal/multimds/clusters/3-node-9-mds.yaml
@@ -1,4 +1,5 @@
 roles:
-- [mon.a, mon.c, mds.b, mds.d, mds.e, mds.f, osd.0, osd.1, osd.2]
-- [mon.b, mds.a, mds.c, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5]
+- [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2]
+- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5]
 - [client.0]
+- [client.1]

diff --git a/suites/marginal/multimds/mounts/ceph-fuse.yaml b/suites/marginal/multimds/mounts/ceph-fuse.yaml
new file mode 100644 (file)
index 0000000..37ac5b6
--- /dev/null
+++ b/suites/marginal/multimds/mounts/ceph-fuse.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+- ceph:
+- ceph-fuse:

diff --git a/suites/marginal/multimds/mounts/kclient.yaml b/suites/marginal/multimds/mounts/kclient.yaml
new file mode 100644 (file)
index 0000000..c18db8f
--- /dev/null
+++ b/suites/marginal/multimds/mounts/kclient.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+- ceph:
+- kclient:

diff --git a/suites/marginal/multimds/tasks/cfuse_workunit_misc.yaml b/suites/marginal/multimds/tasks/cfuse_workunit_misc.yaml
deleted file mode 100644 (file)
index 84dbe5d..0000000
--- a/suites/marginal/multimds/tasks/cfuse_workunit_misc.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - misc

diff --git a/suites/marginal/multimds/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/marginal/multimds/tasks/cfuse_workunit_suites_blogbench.yaml
deleted file mode 100644 (file)
index ed9d92d..0000000
--- a/suites/marginal/multimds/tasks/cfuse_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/blogbench.sh

diff --git a/suites/marginal/multimds/tasks/cfuse_workunit_suites_dbench.yaml b/suites/marginal/multimds/tasks/cfuse_workunit_suites_dbench.yaml
deleted file mode 100644 (file)
index e678ed4..0000000
--- a/suites/marginal/multimds/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/dbench.sh

diff --git a/suites/marginal/multimds/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/marginal/multimds/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index b58487c..0000000
--- a/suites/marginal/multimds/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.sh

diff --git a/suites/marginal/multimds/tasks/cfuse_workunit_suites_fsync.yaml b/suites/marginal/multimds/tasks/cfuse_workunit_suites_fsync.yaml
deleted file mode 100644 (file)
index c1cd14c..0000000
--- a/suites/marginal/multimds/tasks/cfuse_workunit_suites_fsync.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/fsync-tester.sh

diff --git a/suites/marginal/multimds/tasks/cfuse_workunit_suites_pjd.yaml b/suites/marginal/multimds/tasks/cfuse_workunit_suites_pjd.yaml
deleted file mode 100644 (file)
index b3ebffb..0000000
--- a/suites/marginal/multimds/tasks/cfuse_workunit_suites_pjd.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-tasks:
-- install:
-- ceph:
-    conf:
-      client:
-        debug ms: 1
-        debug client: 20
-      mds:
-        debug ms: 1
-        debug mds: 20
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/pjd.sh

diff --git a/suites/marginal/multimds/tasks/cfuse_workunit_suites_truncate_delay.yaml b/suites/marginal/multimds/tasks/cfuse_workunit_suites_truncate_delay.yaml
deleted file mode 100644 (file)
index 3aa5f88..0000000
--- a/suites/marginal/multimds/tasks/cfuse_workunit_suites_truncate_delay.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-tasks:
-- install:
-- ceph:
-    conf:
-      client:
-        ms_inject_delay_probability: 1
-        ms_inject_delay_type: osd
-        ms_inject_delay_max: 5
-        client_oc_max_dirty_age: 1
-- ceph-fuse:
-- exec:
-    client.0:
-      - dd if=/dev/zero of=./foo count=100
-      - sleep 2
-      - truncate --size 0 ./foo

diff --git a/suites/marginal/multimds/tasks/libcephfs_interface_tests.yaml b/suites/marginal/multimds/tasks/libcephfs_interface_tests.yaml
deleted file mode 100644 (file)
index 22d1f14..0000000
--- a/suites/marginal/multimds/tasks/libcephfs_interface_tests.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - libcephfs/test.sh

diff --git a/suites/marginal/multimds/tasks/workunit_misc.yaml b/suites/marginal/multimds/tasks/workunit_misc.yaml
new file mode 100644 (file)
index 0000000..f1235e7
--- /dev/null
+++ b/suites/marginal/multimds/tasks/workunit_misc.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - misc

diff --git a/suites/marginal/multimds/tasks/workunit_suites_blogbench.yaml b/suites/marginal/multimds/tasks/workunit_suites_blogbench.yaml
new file mode 100644 (file)
index 0000000..4c1fcc1
--- /dev/null
+++ b/suites/marginal/multimds/tasks/workunit_suites_blogbench.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/blogbench.sh

diff --git a/suites/marginal/multimds/tasks/workunit_suites_dbench.yaml b/suites/marginal/multimds/tasks/workunit_suites_dbench.yaml
new file mode 100644 (file)
index 0000000..41b2bc8
--- /dev/null
+++ b/suites/marginal/multimds/tasks/workunit_suites_dbench.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/dbench.sh

diff --git a/suites/marginal/multimds/tasks/workunit_suites_fsstress.yaml b/suites/marginal/multimds/tasks/workunit_suites_fsstress.yaml
new file mode 100644 (file)
index 0000000..ddb18fb
--- /dev/null
+++ b/suites/marginal/multimds/tasks/workunit_suites_fsstress.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/fsstress.sh

diff --git a/suites/marginal/multimds/tasks/workunit_suites_fsync.yaml b/suites/marginal/multimds/tasks/workunit_suites_fsync.yaml
new file mode 100644 (file)
index 0000000..7efa1ad
--- /dev/null
+++ b/suites/marginal/multimds/tasks/workunit_suites_fsync.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/fsync-tester.sh

diff --git a/suites/marginal/multimds/tasks/workunit_suites_pjd.yaml b/suites/marginal/multimds/tasks/workunit_suites_pjd.yaml
new file mode 100644 (file)
index 0000000..e888213
--- /dev/null
+++ b/suites/marginal/multimds/tasks/workunit_suites_pjd.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/pjd.sh

diff --git a/suites/marginal/multimds/tasks/workunit_suites_truncate_delay.yaml b/suites/marginal/multimds/tasks/workunit_suites_truncate_delay.yaml
new file mode 100644 (file)
index 0000000..3aa5f88
--- /dev/null
+++ b/suites/marginal/multimds/tasks/workunit_suites_truncate_delay.yaml
@@ -0,0 +1,15 @@
+tasks:
+- install:
+- ceph:
+    conf:
+      client:
+        ms_inject_delay_probability: 1
+        ms_inject_delay_type: osd
+        ms_inject_delay_max: 5
+        client_oc_max_dirty_age: 1
+- ceph-fuse:
+- exec:
+    client.0:
+      - dd if=/dev/zero of=./foo count=100
+      - sleep 2
+      - truncate --size 0 ./foo