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 (file)
index 0000000..b6f8e31
--- /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 86fe06afa0501c95d634d57e89e16fe93f78628c..a55ec1df0752d4e7300da7df13b6232bebb70806 100644 (file)
--- 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 (file)
index 0000000..b6f8e31
--- /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 86fe06afa0501c95d634d57e89e16fe93f78628c..a55ec1df0752d4e7300da7df13b6232bebb70806 100644 (file)
--- 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 (file)
index 0000000..3a19b31
--- /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 bf1b4befe032d754519994180688c0be78eb486b..48e370ec128f20cb1c3f1f81df1178cf66a556ad 100644 (file)
--- 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 e763bcc34e9c5d51cd183904fa5fd3f99f7a6b31..ba90c1d1e8d7e4f1049294ba35b6a458ece8c1f9 100644 (file)
--- 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 (file)
index 0000000..e9ea1eb
--- /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 98e0b392697ae4acd827919e6d5c6dc0575490b8..41f7d84c9c0c5269659d347296294389063fedd2 100644 (file)
--- 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