From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Oct 2016 18:57:39 +0000 (-0400)
Subject: rados: move readwrite test out of thrash matrix
X-Git-Tag: v11.1.1~58^2^2~79^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4854e2c9339597afbeb7c12e506448370665cbd1;p=ceph.git

rados: move readwrite test out of thrash matrix

The thrash matrix includes min_size = 2 and size = 2.  This
is fine and good, except that the inevitable slow rados ops
that generates make readwrite.yaml issue timeouts and
fail.  Since the workload isn't meant to tolerate slow
requests, move it into the basic/ group.

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

diff --git a/suites/rados/basic/tasks/readwrite.yaml b/suites/rados/basic/tasks/readwrite.yaml
new file mode 100644
index 0000000000000..38343f316eb70
--- /dev/null
+++ b/suites/rados/basic/tasks/readwrite.yaml
@@ -0,0 +1,17 @@
+overrides:
+  ceph:
+    crush_tunables: optimal
+    conf:
+      osd:
+        osd_discard_disconnected_ops: false
+tasks:
+- install:
+- ceph:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 45
+      write: 45
+      delete: 10
diff --git a/suites/rados/thrash/workloads/readwrite.yaml b/suites/rados/thrash/workloads/readwrite.yaml
deleted file mode 100644
index 2ab9b28f94972..0000000000000
--- a/suites/rados/thrash/workloads/readwrite.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-overrides:
-  ceph:
-    crush_tunables: optimal
-    conf:
-      osd:
-        osd_discard_disconnected_ops: false
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 45
-      write: 45
-      delete: 10