rados: expand mon thrashing tests

- test sync (full and recent)
- test multiple mons down
- test other cluster sizes (3 and 9)

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

diff --git a/suites/rados/monthrash/clusters/3-mons.yaml b/suites/rados/monthrash/clusters/3-mons.yaml
new file mode 100644 (file)
index 0000000..6298ff2
--- /dev/null
+++ b/suites/rados/monthrash/clusters/3-mons.yaml
@@ -0,0 +1,3 @@
+roles:
+- [mon.a, mon.c, osd.0, osd.1, osd.2]
+- [mon.b, mds.a, osd.3, osd.4, osd.5, client.0]

diff --git a/suites/rados/monthrash/clusters/9-mons.yaml b/suites/rados/monthrash/clusters/9-mons.yaml
new file mode 100644 (file)
index 0000000..a22e6c5
--- /dev/null
+++ b/suites/rados/monthrash/clusters/9-mons.yaml
@@ -0,0 +1,3 @@
+roles:
+- [mon.a, mon.b, mon.c, mon.d, mon.e, osd.0, osd.1, osd.2]
+- [mon.f, mon.g, mon.h, mon.i, mds.a, osd.3, osd.4, osd.5, client.0]

diff --git a/suites/rados/monthrash/clusters/fixed-2.yaml b/suites/rados/monthrash/clusters/fixed-2.yaml
deleted file mode 120000 (symlink)
index cd0791a..0000000
--- a/suites/rados/monthrash/clusters/fixed-2.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../clusters/fixed-2.yaml
\ No newline at end of file

diff --git a/suites/rados/monthrash/thrashers/force-sync-many.yaml b/suites/rados/monthrash/thrashers/force-sync-many.yaml
new file mode 100644 (file)
index 0000000..3efb5f6
--- /dev/null
+++ b/suites/rados/monthrash/thrashers/force-sync-many.yaml
@@ -0,0 +1,8 @@
+tasks:
+- install:
+- ceph:
+- mon_thrash:
+    revive_delay: 90
+    thrash_delay: 1
+    thrash_store: true
+    thrash_many: true

diff --git a/suites/rados/monthrash/thrashers/many.yaml b/suites/rados/monthrash/thrashers/many.yaml
new file mode 100644 (file)
index 0000000..565a383
--- /dev/null
+++ b/suites/rados/monthrash/thrashers/many.yaml
@@ -0,0 +1,14 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        debug mon: 20
+        debug paxos: 20
+        debug ms: 1
+tasks:
+- install:
+- ceph:
+- mon_thrash:
+    revive_delay: 20
+    thrash_delay: 1
+    thrash_many: true

diff --git a/suites/rados/monthrash/thrashers/mon-thrasher.yaml b/suites/rados/monthrash/thrashers/mon-thrasher.yaml
deleted file mode 100644 (file)
index df143b0..0000000
--- a/suites/rados/monthrash/thrashers/mon-thrasher.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mon:
-        debug mon: 20
-        debug paxos: 20
-        debug ms: 1
-tasks:
-- install:
-- ceph:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1

diff --git a/suites/rados/monthrash/thrashers/one.yaml b/suites/rados/monthrash/thrashers/one.yaml
new file mode 100644 (file)
index 0000000..df143b0
--- /dev/null
+++ b/suites/rados/monthrash/thrashers/one.yaml
@@ -0,0 +1,13 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        debug mon: 20
+        debug paxos: 20
+        debug ms: 1
+tasks:
+- install:
+- ceph:
+- mon_thrash:
+    revive_delay: 20
+    thrash_delay: 1

diff --git a/suites/rados/monthrash/thrashers/sync-many.yaml b/suites/rados/monthrash/thrashers/sync-many.yaml
new file mode 100644 (file)
index 0000000..f85b3ab
--- /dev/null
+++ b/suites/rados/monthrash/thrashers/sync-many.yaml
@@ -0,0 +1,13 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        paxos min: 10
+        paxos trim min: 10
+tasks:
+- install:
+- ceph:
+- mon_thrash:
+    revive_delay: 90
+    thrash_delay: 1
+    thrash_many: true

diff --git a/suites/rados/monthrash/thrashers/sync.yaml b/suites/rados/monthrash/thrashers/sync.yaml
new file mode 100644 (file)
index 0000000..29ef7cf
--- /dev/null
+++ b/suites/rados/monthrash/thrashers/sync.yaml
@@ -0,0 +1,12 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        paxos min: 10
+        paxos trim min: 10
+tasks:
+- install:
+- ceph:
+- mon_thrash:
+    revive_delay: 90
+    thrash_delay: 1