suites/rbd: split qemu and librbd tests

qemu tests take a long time. We'll want to test more combinations of
options with librbd directly.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/suites/rbd/librbd/workloads/qemu_bonnie.yaml b/suites/rbd/librbd/workloads/qemu_bonnie.yaml
deleted file mode 100644 (file)
index 45368ee..0000000
--- a/suites/rbd/librbd/workloads/qemu_bonnie.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- qemu:
-    all:
-      test: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/bonnie.sh
-exclude_arch: armv7l

diff --git a/suites/rbd/librbd/workloads/qemu_fsstress.yaml b/suites/rbd/librbd/workloads/qemu_fsstress.yaml
deleted file mode 100644 (file)
index 9ca3e17..0000000
--- a/suites/rbd/librbd/workloads/qemu_fsstress.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- qemu:
-    all:
-      test: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/fsstress.sh
-exclude_arch: armv7l

diff --git a/suites/rbd/librbd/workloads/qemu_iozone.yaml.disabled b/suites/rbd/librbd/workloads/qemu_iozone.yaml.disabled
deleted file mode 100644 (file)
index dfd4181..0000000
--- a/suites/rbd/librbd/workloads/qemu_iozone.yaml.disabled
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- qemu:
-    all:
-      test: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/iozone.sh
-      image_size: 20480
-exclude_arch: armv7l

diff --git a/suites/rbd/librbd/workloads/qemu_xfstests.yaml b/suites/rbd/librbd/workloads/qemu_xfstests.yaml
deleted file mode 100644 (file)
index fa0fe22..0000000
--- a/suites/rbd/librbd/workloads/qemu_xfstests.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- qemu:
-    all:
-      type: block
-      num_rbd: 2
-      test: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa/run_xfstests_qemu.sh
-exclude_arch: armv7l

diff --git a/suites/rbd/qemu/% b/suites/rbd/qemu/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rbd/qemu/cache/none.yaml b/suites/rbd/qemu/cache/none.yaml
new file mode 100644 (file)
index 0000000..42fd9c9
--- /dev/null
+++ b/suites/rbd/qemu/cache/none.yaml
@@ -0,0 +1,6 @@
+tasks:
+- install:
+- ceph:
+    conf:
+      client:
+        rbd cache: false

diff --git a/suites/rbd/qemu/cache/writeback.yaml b/suites/rbd/qemu/cache/writeback.yaml
new file mode 100644 (file)
index 0000000..86fe06a
--- /dev/null
+++ b/suites/rbd/qemu/cache/writeback.yaml
@@ -0,0 +1,6 @@
+tasks:
+- install:
+- ceph:
+    conf:
+      client:
+        rbd cache: true

diff --git a/suites/rbd/qemu/cache/writethrough.yaml b/suites/rbd/qemu/cache/writethrough.yaml
new file mode 100644 (file)
index 0000000..6dc29e1
--- /dev/null
+++ b/suites/rbd/qemu/cache/writethrough.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+- ceph:
+    conf:
+      client:
+        rbd cache: true
+        rbd cache max dirty: 0

diff --git a/suites/rbd/qemu/cachepool/none.yaml b/suites/rbd/qemu/cachepool/none.yaml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rbd/qemu/cachepool/small.yaml b/suites/rbd/qemu/cachepool/small.yaml
new file mode 100644 (file)
index 0000000..f8ed110
--- /dev/null
+++ b/suites/rbd/qemu/cachepool/small.yaml
@@ -0,0 +1,11 @@
+tasks:
+- exec:
+    client.0:
+      - ceph osd pool create cache 4
+      - ceph osd tier add rbd cache
+      - ceph osd tier cache-mode cache writeback
+      - ceph osd tier set-overlay rbd cache
+      - ceph osd pool set cache hit_set_type bloom
+      - ceph osd pool set cache hit_set_count 8
+      - ceph osd pool set cache hit_set_period 60
+      - ceph osd pool set cache target_max_objects 250

diff --git a/suites/rbd/qemu/clusters/fixed-3.yaml b/suites/rbd/qemu/clusters/fixed-3.yaml
new file mode 120000 (symlink)
index 0000000..a3ac9fc
--- /dev/null
+++ b/suites/rbd/qemu/clusters/fixed-3.yaml
@@ -0,0 +1 @@
+../../../../clusters/fixed-3.yaml
\ No newline at end of file

diff --git a/suites/rbd/qemu/fs b/suites/rbd/qemu/fs
new file mode 120000 (symlink)
index 0000000..3658920
--- /dev/null
+++ b/suites/rbd/qemu/fs
@@ -0,0 +1 @@
+../basic/fs
\ No newline at end of file

diff --git a/suites/rbd/qemu/msgr-failures/few.yaml b/suites/rbd/qemu/msgr-failures/few.yaml
new file mode 100644 (file)
index 0000000..a8bc683
--- /dev/null
+++ b/suites/rbd/qemu/msgr-failures/few.yaml
@@ -0,0 +1,7 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms inject socket failures: 5000
+    log-whitelist:
+    - wrongly marked me down

diff --git a/suites/rbd/qemu/workloads/qemu_bonnie.yaml b/suites/rbd/qemu/workloads/qemu_bonnie.yaml
new file mode 100644 (file)
index 0000000..45368ee
--- /dev/null
+++ b/suites/rbd/qemu/workloads/qemu_bonnie.yaml
@@ -0,0 +1,5 @@
+tasks:
+- qemu:
+    all:
+      test: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/bonnie.sh
+exclude_arch: armv7l

diff --git a/suites/rbd/qemu/workloads/qemu_fsstress.yaml b/suites/rbd/qemu/workloads/qemu_fsstress.yaml
new file mode 100644 (file)
index 0000000..9ca3e17
--- /dev/null
+++ b/suites/rbd/qemu/workloads/qemu_fsstress.yaml
@@ -0,0 +1,5 @@
+tasks:
+- qemu:
+    all:
+      test: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/fsstress.sh
+exclude_arch: armv7l

diff --git a/suites/rbd/qemu/workloads/qemu_iozone.yaml.disabled b/suites/rbd/qemu/workloads/qemu_iozone.yaml.disabled
new file mode 100644 (file)
index 0000000..dfd4181
--- /dev/null
+++ b/suites/rbd/qemu/workloads/qemu_iozone.yaml.disabled
@@ -0,0 +1,6 @@
+tasks:
+- qemu:
+    all:
+      test: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/iozone.sh
+      image_size: 20480
+exclude_arch: armv7l

diff --git a/suites/rbd/qemu/workloads/qemu_xfstests.yaml b/suites/rbd/qemu/workloads/qemu_xfstests.yaml
new file mode 100644 (file)
index 0000000..fa0fe22
--- /dev/null
+++ b/suites/rbd/qemu/workloads/qemu_xfstests.yaml
@@ -0,0 +1,7 @@
+tasks:
+- qemu:
+    all:
+      type: block
+      num_rbd: 2
+      test: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=qa/run_xfstests_qemu.sh
+exclude_arch: armv7l