qa/suites: add diff-continuous and compare-mirror-image tests

... to rbd and krbd suites respectively.

This allows the compare-mirror-image tests introduced in ea3a567
to be run against various kernel branches, e.g., testing branch.
And allows diff_continuous test in rbd_suite to run against distro
kernel.

Fixes: https://tracker.ceph.com/issues/64574
Signed-off-by: Ramana Raja <rraja@redhat.com>

diff --git a/qa/suites/krbd/mirror/% b/qa/suites/krbd/mirror/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/krbd/mirror/.qa b/qa/suites/krbd/mirror/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/krbd/mirror/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/krbd/mirror/bluestore-bitmap.yaml b/qa/suites/krbd/mirror/bluestore-bitmap.yaml
new file mode 120000 (symlink)
index 0000000..a59cf51
--- /dev/null
+++ b/qa/suites/krbd/mirror/bluestore-bitmap.yaml
@@ -0,0 +1 @@
+.qa/objectstore/bluestore-bitmap.yaml
\ No newline at end of file

diff --git a/qa/suites/krbd/mirror/clusters/.qa b/qa/suites/krbd/mirror/clusters/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/krbd/mirror/clusters/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/krbd/mirror/clusters/2-node.yaml b/qa/suites/krbd/mirror/clusters/2-node.yaml
new file mode 100644 (file)
index 0000000..e5036ea
--- /dev/null
+++ b/qa/suites/krbd/mirror/clusters/2-node.yaml
@@ -0,0 +1,17 @@
+meta:
+- desc: 2 ceph clusters with 1 mon, 1 mgr and 3 osd each
+roles:
+- - cluster1.mon.a
+  - cluster1.mgr.x
+  - cluster1.osd.0
+  - cluster1.osd.1
+  - cluster1.osd.2
+- - cluster2.mon.a
+  - cluster2.mgr.x
+  - cluster2.osd.0
+  - cluster2.osd.1
+  - cluster2.osd.2
+  - cluster1.client.mirror
+  - cluster1.client.mirror.0
+  - cluster2.client.mirror
+  - cluster2.client.mirror.0

diff --git a/qa/suites/krbd/mirror/conf.yaml b/qa/suites/krbd/mirror/conf.yaml
new file mode 100644 (file)
index 0000000..eb6d72a
--- /dev/null
+++ b/qa/suites/krbd/mirror/conf.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        mon warn on pool no app: false
+        ms die on skipped message: false

diff --git a/qa/suites/krbd/mirror/install/.qa b/qa/suites/krbd/mirror/install/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/krbd/mirror/install/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/krbd/mirror/install/ceph.yaml b/qa/suites/krbd/mirror/install/ceph.yaml
new file mode 100644 (file)
index 0000000..08bb1fa
--- /dev/null
+++ b/qa/suites/krbd/mirror/install/ceph.yaml
@@ -0,0 +1,14 @@
+tasks:
+- install:
+    extra_packages:
+    - rbd-mirror
+- ceph:
+    cluster: cluster1
+- ceph:
+    cluster: cluster2
+- rbd-mirror:
+    client: cluster1.client.mirror.0
+    thrash: False
+- rbd-mirror:
+    client: cluster2.client.mirror.0
+    thrash: False

diff --git a/qa/suites/krbd/mirror/ms_mode$/.qa b/qa/suites/krbd/mirror/ms_mode$/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/krbd/mirror/ms_mode$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/krbd/mirror/ms_mode$/crc-rxbounce.yaml b/qa/suites/krbd/mirror/ms_mode$/crc-rxbounce.yaml
new file mode 100644 (file)
index 0000000..4d27d01
--- /dev/null
+++ b/qa/suites/krbd/mirror/ms_mode$/crc-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc,rxbounce

diff --git a/qa/suites/krbd/mirror/ms_mode$/crc.yaml b/qa/suites/krbd/mirror/ms_mode$/crc.yaml
new file mode 100644 (file)
index 0000000..3b07257
--- /dev/null
+++ b/qa/suites/krbd/mirror/ms_mode$/crc.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=crc

diff --git a/qa/suites/krbd/mirror/ms_mode$/legacy-rxbounce.yaml b/qa/suites/krbd/mirror/ms_mode$/legacy-rxbounce.yaml
new file mode 100644 (file)
index 0000000..244e45c
--- /dev/null
+++ b/qa/suites/krbd/mirror/ms_mode$/legacy-rxbounce.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy,rxbounce

diff --git a/qa/suites/krbd/mirror/ms_mode$/legacy.yaml b/qa/suites/krbd/mirror/ms_mode$/legacy.yaml
new file mode 100644 (file)
index 0000000..0048dcb
--- /dev/null
+++ b/qa/suites/krbd/mirror/ms_mode$/legacy.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=legacy

diff --git a/qa/suites/krbd/mirror/ms_mode$/secure.yaml b/qa/suites/krbd/mirror/ms_mode$/secure.yaml
new file mode 100644 (file)
index 0000000..a735db1
--- /dev/null
+++ b/qa/suites/krbd/mirror/ms_mode$/secure.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default map options: ms_mode=secure

diff --git a/qa/suites/krbd/mirror/tasks/.qa b/qa/suites/krbd/mirror/tasks/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/krbd/mirror/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/krbd/mirror/tasks/compare-mirror-image-alternate-primary.yaml b/qa/suites/krbd/mirror/tasks/compare-mirror-image-alternate-primary.yaml
new file mode 100644 (file)
index 0000000..42ee5a2
--- /dev/null
+++ b/qa/suites/krbd/mirror/tasks/compare-mirror-image-alternate-primary.yaml
@@ -0,0 +1,14 @@
+overrides:
+  install:
+    ceph:
+      extra_system_packages:
+        - pv
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror:
+        - rbd/compare_mirror_image_alternate_primary.sh
+    env:
+      RBD_DEVICE_TYPE: 'krbd'
+      RBD_MIRROR_USE_RBD_MIRROR: '1'
+    timeout: 3h

diff --git a/qa/suites/krbd/mirror/tasks/compare-mirror-images.yaml b/qa/suites/krbd/mirror/tasks/compare-mirror-images.yaml
new file mode 100644 (file)
index 0000000..30d147d
--- /dev/null
+++ b/qa/suites/krbd/mirror/tasks/compare-mirror-images.yaml
@@ -0,0 +1,14 @@
+overrides:
+  install:
+    ceph:
+      extra_system_packages:
+        - pv
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror:
+        - rbd/compare_mirror_images.sh
+    env:
+      RBD_DEVICE_TYPE: 'krbd'
+      RBD_MIRROR_USE_RBD_MIRROR: '1'
+    timeout: 3h

diff --git a/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml b/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml
new file mode 100644 (file)
index 0000000..5907718
--- /dev/null
+++ b/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml
@@ -0,0 +1,12 @@
+overrides:
+  install:
+    ceph:
+      extra_system_packages:
+        - pv
+tasks:
+- workunit:
+    clients:
+      all:
+        - rbd/diff_continuous.sh
+    env:
+      RBD_DEVICE_TYPE: "krbd"

diff --git a/qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml b/qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml
new file mode 100644 (file)
index 0000000..e0a7ebe
--- /dev/null
+++ b/qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml
@@ -0,0 +1,14 @@
+overrides:
+  install:
+    ceph:
+      extra_packages:
+        - rbd-nbd
+      extra_system_packages:
+        - pv
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/diff_continuous.sh
+    env:
+      RBD_DEVICE_TYPE: "nbd"

diff --git a/qa/suites/rbd/device/workloads/rbd_nbd_diff_continuous.yaml b/qa/suites/rbd/device/workloads/rbd_nbd_diff_continuous.yaml
deleted file mode 100644 (file)
index e0a7ebe..0000000
--- a/qa/suites/rbd/device/workloads/rbd_nbd_diff_continuous.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  install:
-    ceph:
-      extra_packages:
-        - rbd-nbd
-      extra_system_packages:
-        - pv
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/diff_continuous.sh
-    env:
-      RBD_DEVICE_TYPE: "nbd"