From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 19 Apr 2019 18:11:43 +0000 (-0400)
Subject: qa/suites/rbd: added writearound cache test permutations
X-Git-Tag: v15.1.0~2877^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ead16e9ad7a647287d395c94c0adc0b0d0d0259c;p=ceph.git

qa/suites/rbd: added writearound cache test permutations

Also tweaked the existing writeback cache test permutations to
specify the use of the writeback cache policy.

Fixes:  http://tracker.ceph.com/issues/39386
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/suites/rbd/librbd/cache/writearound.yaml b/qa/suites/rbd/librbd/cache/writearound.yaml
new file mode 100644
index 000000000000..b6f8e319b198
--- /dev/null
+++ b/qa/suites/rbd/librbd/cache/writearound.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+- ceph:
+    conf:
+      client:
+        rbd cache: true
+        rbd cache policy: writearound
diff --git a/qa/suites/rbd/librbd/cache/writeback.yaml b/qa/suites/rbd/librbd/cache/writeback.yaml
index 86fe06afa050..a55ec1df0752 100644
--- a/qa/suites/rbd/librbd/cache/writeback.yaml
+++ b/qa/suites/rbd/librbd/cache/writeback.yaml
@@ -4,3 +4,4 @@ tasks:
     conf:
       client:
         rbd cache: true
+        rbd cache policy: writeback
diff --git a/qa/suites/rbd/qemu/cache/writearound.yaml b/qa/suites/rbd/qemu/cache/writearound.yaml
new file mode 100644
index 000000000000..b6f8e319b198
--- /dev/null
+++ b/qa/suites/rbd/qemu/cache/writearound.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+- ceph:
+    conf:
+      client:
+        rbd cache: true
+        rbd cache policy: writearound
diff --git a/qa/suites/rbd/qemu/cache/writeback.yaml b/qa/suites/rbd/qemu/cache/writeback.yaml
index 86fe06afa050..a55ec1df0752 100644
--- a/qa/suites/rbd/qemu/cache/writeback.yaml
+++ b/qa/suites/rbd/qemu/cache/writeback.yaml
@@ -4,3 +4,4 @@ tasks:
     conf:
       client:
         rbd cache: true
+        rbd cache policy: writeback
diff --git a/qa/suites/rbd/singleton/all/qemu-iotests-writearound.yaml b/qa/suites/rbd/singleton/all/qemu-iotests-writearound.yaml
new file mode 100644
index 000000000000..3a19b317c7a9
--- /dev/null
+++ b/qa/suites/rbd/singleton/all/qemu-iotests-writearound.yaml
@@ -0,0 +1,14 @@
+exclude_arch: armv7l
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+tasks:
+- install:
+- ceph:
+    fs: xfs
+    conf:
+      client:
+        rbd cache: true
+        rbd cache policy: writearound
+- workunit:
+    clients:
+      all: [rbd/qemu-iotests.sh]
diff --git a/qa/suites/rbd/singleton/all/qemu-iotests-writeback.yaml b/qa/suites/rbd/singleton/all/qemu-iotests-writeback.yaml
index bf1b4befe032..48e370ec128f 100644
--- a/qa/suites/rbd/singleton/all/qemu-iotests-writeback.yaml
+++ b/qa/suites/rbd/singleton/all/qemu-iotests-writeback.yaml
@@ -8,6 +8,7 @@ tasks:
     conf:
       client:
         rbd cache: true
+        rbd cache policy: writeback
 - workunit:
     clients:
       all: [rbd/qemu-iotests.sh]
diff --git a/qa/suites/rbd/singleton/all/read-flags-writeback.yaml b/qa/suites/rbd/singleton/all/read-flags-writeback.yaml
index e763bcc34e9c..ba90c1d1e8d7 100644
--- a/qa/suites/rbd/singleton/all/read-flags-writeback.yaml
+++ b/qa/suites/rbd/singleton/all/read-flags-writeback.yaml
@@ -7,6 +7,7 @@ tasks:
     conf:
       client:
         rbd cache: true
+        rbd cache policy: writeback
 - workunit:
     clients:
       all: [rbd/read-flags.sh]
diff --git a/qa/suites/rbd/thrash/workloads/rbd_fsx_cache_writearound.yaml b/qa/suites/rbd/thrash/workloads/rbd_fsx_cache_writearound.yaml
new file mode 100644
index 000000000000..e9ea1ebd143c
--- /dev/null
+++ b/qa/suites/rbd/thrash/workloads/rbd_fsx_cache_writearound.yaml
@@ -0,0 +1,10 @@
+tasks:
+- rbd_fsx:
+    clients: [client.0]
+    ops: 6000
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd cache: true
+        rbd cache policy: writearound
diff --git a/qa/suites/rbd/thrash/workloads/rbd_fsx_cache_writeback.yaml b/qa/suites/rbd/thrash/workloads/rbd_fsx_cache_writeback.yaml
index 98e0b392697a..41f7d84c9c0c 100644
--- a/qa/suites/rbd/thrash/workloads/rbd_fsx_cache_writeback.yaml
+++ b/qa/suites/rbd/thrash/workloads/rbd_fsx_cache_writeback.yaml
@@ -7,3 +7,4 @@ overrides:
     conf:
       client:
         rbd cache: true
+        rbd cache policy: writeback