From 8d5ca943316eed64c04fe5466403238d4894b8ad Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 11 Feb 2013 07:13:41 -0800
Subject: [PATCH] rados: separate out mon thrasher from thrasher collection

Run a different set of tests.
---
 suites/rados/monthrash/clusters/6-osd-3-machine.yaml |  4 ++++
 suites/rados/monthrash/fs/xfs.yaml                   |  3 +++
 suites/rados/monthrash/msgr-failures/few.yaml        |  5 +++++
 suites/rados/monthrash/msgr-failures/osd-delay.yaml  |  8 ++++++++
 .../thrashers/mon-thrasher.yaml                      |  0
 .../rados/monthrash/workloads/rados_api_tests.yaml   |  6 ++++++
 .../rados/monthrash/workloads/snaps-few-objects.yaml | 12 ++++++++++++
 .../monthrash/workloads/snaps-many-objects.yaml      | 12 ++++++++++++
 suites/regression/rados-monthrash                    |  1 +
 9 files changed, 51 insertions(+)
 create mode 100644 suites/rados/monthrash/clusters/6-osd-3-machine.yaml
 create mode 100644 suites/rados/monthrash/fs/xfs.yaml
 create mode 100644 suites/rados/monthrash/msgr-failures/few.yaml
 create mode 100644 suites/rados/monthrash/msgr-failures/osd-delay.yaml
 rename suites/rados/{thrash => monthrash}/thrashers/mon-thrasher.yaml (100%)
 create mode 100644 suites/rados/monthrash/workloads/rados_api_tests.yaml
 create mode 100644 suites/rados/monthrash/workloads/snaps-few-objects.yaml
 create mode 100644 suites/rados/monthrash/workloads/snaps-many-objects.yaml
 create mode 120000 suites/regression/rados-monthrash

diff --git a/suites/rados/monthrash/clusters/6-osd-3-machine.yaml b/suites/rados/monthrash/clusters/6-osd-3-machine.yaml
new file mode 100644
index 00000000000..294c2e08b09
--- /dev/null
+++ b/suites/rados/monthrash/clusters/6-osd-3-machine.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.b, osd.0, osd.1, osd.2]
+- [mon.c, mds.a, osd.3, osd.4, osd.5]
+- [client.0]
diff --git a/suites/rados/monthrash/fs/xfs.yaml b/suites/rados/monthrash/fs/xfs.yaml
new file mode 100644
index 00000000000..bfc3d618fc9
--- /dev/null
+++ b/suites/rados/monthrash/fs/xfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: xfs
diff --git a/suites/rados/monthrash/msgr-failures/few.yaml b/suites/rados/monthrash/msgr-failures/few.yaml
new file mode 100644
index 00000000000..0de320d46b8
--- /dev/null
+++ b/suites/rados/monthrash/msgr-failures/few.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms inject socket failures: 5000
diff --git a/suites/rados/monthrash/msgr-failures/osd-delay.yaml b/suites/rados/monthrash/msgr-failures/osd-delay.yaml
new file mode 100644
index 00000000000..171346dfcbe
--- /dev/null
+++ b/suites/rados/monthrash/msgr-failures/osd-delay.yaml
@@ -0,0 +1,8 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms inject socket failures: 2500
+        ms inject delay type: osd
+        ms inject delay probability: .005
+        ms inject delay max: 1
diff --git a/suites/rados/thrash/thrashers/mon-thrasher.yaml b/suites/rados/monthrash/thrashers/mon-thrasher.yaml
similarity index 100%
rename from suites/rados/thrash/thrashers/mon-thrasher.yaml
rename to suites/rados/monthrash/thrashers/mon-thrasher.yaml
diff --git a/suites/rados/monthrash/workloads/rados_api_tests.yaml b/suites/rados/monthrash/workloads/rados_api_tests.yaml
new file mode 100644
index 00000000000..b4708ebd7c0
--- /dev/null
+++ b/suites/rados/monthrash/workloads/rados_api_tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh
diff --git a/suites/rados/monthrash/workloads/snaps-few-objects.yaml b/suites/rados/monthrash/workloads/snaps-few-objects.yaml
new file mode 100644
index 00000000000..c54039766c0
--- /dev/null
+++ b/suites/rados/monthrash/workloads/snaps-few-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
diff --git a/suites/rados/monthrash/workloads/snaps-many-objects.yaml b/suites/rados/monthrash/workloads/snaps-many-objects.yaml
new file mode 100644
index 00000000000..9e311c946e1
--- /dev/null
+++ b/suites/rados/monthrash/workloads/snaps-many-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
diff --git a/suites/regression/rados-monthrash b/suites/regression/rados-monthrash
new file mode 120000
index 00000000000..754aedde874
--- /dev/null
+++ b/suites/regression/rados-monthrash
@@ -0,0 +1 @@
+../rados/monthrash/
\ No newline at end of file