From: Sage Weil <sage@redhat.com>
Date: Mon, 17 Oct 2016 15:28:20 +0000 (-0400)
Subject: rados: move rgw_snaps from thrash to basic
X-Git-Tag: v11.1.1~58^2^2~76^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1de5bf03ecfa3e450ea8ee9fef81450b83ea189;p=ceph.git

rados: move rgw_snaps from thrash to basic

rgw does not tolerate min_size=2 + size=2 thrashing (slow
rados ops).

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

diff --git a/suites/rados/basic/tasks/rgw_snaps.yaml b/suites/rados/basic/tasks/rgw_snaps.yaml
new file mode 100644
index 000000000000..b248ebbc7fa7
--- /dev/null
+++ b/suites/rados/basic/tasks/rgw_snaps.yaml
@@ -0,0 +1,33 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        debug rgw: 20
+        debug ms: 1
+tasks:
+- install:
+- ceph:
+- rgw:
+    default_idle_timeout: 3600
+    client.0: null
+- thrash_pool_snaps:
+    pools:
+    - .rgw.buckets
+    - .rgw.root
+    - .rgw.control
+    - .rgw
+    - .users.uid
+    - .users.email
+    - .users
+- s3readwrite:
+    client.0:
+      rgw_server: client.0
+      readwrite:
+        bucket: rwtest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500
diff --git a/suites/rados/thrash/workloads/rgw_snaps.yaml b/suites/rados/thrash/workloads/rgw_snaps.yaml
deleted file mode 100644
index 639a388f2fbc..000000000000
--- a/suites/rados/thrash/workloads/rgw_snaps.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        debug rgw: 20
-        debug ms: 1
-tasks:
-- rgw:
-    default_idle_timeout: 3600
-    client.0: null
-- thrash_pool_snaps:
-    pools:
-    - .rgw.buckets
-    - .rgw.root
-    - .rgw.control
-    - .rgw
-    - .users.uid
-    - .users.email
-    - .users
-- s3readwrite:
-    client.0:
-      rgw_server: client.0
-      readwrite:
-        bucket: rwtest
-        readers: 10
-        writers: 3
-        duration: 300
-        files:
-          num: 10
-          size: 2000
-          stddev: 500