qa/suites/rbd: exercise different snapshot-based mirroring image features

Ensure that snapshot-based mirroring is tested in different RBD image
feature combinations.

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

diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-exclusive-lock.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-exclusive-lock.yaml
new file mode 100644 (file)
index 0000000..29047a7
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-exclusive-lock.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh]
+    env:
+      # override workunit setting of CEPH_ARGS='--cluster'
+      CEPH_ARGS: ''
+      RBD_MIRROR_INSTANCES: '4'
+      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
+      RBD_MIRROR_CONFIG_KEY: '1'
+      RBD_IMAGE_FEATURES: 'layering,exclusive-lock'

diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-fast-diff.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-fast-diff.yaml
new file mode 100644 (file)
index 0000000..af13c92
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-fast-diff.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh]
+    env:
+      # override workunit setting of CEPH_ARGS='--cluster'
+      CEPH_ARGS: ''
+      RBD_MIRROR_INSTANCES: '4'
+      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
+      RBD_MIRROR_CONFIG_KEY: '1'
+      RBD_IMAGE_FEATURES: 'layering,exclusive-lock,object-map,fast-diff'

diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-journaling.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-journaling.yaml
new file mode 100644 (file)
index 0000000..5ea2bb1
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-journaling.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh]
+    env:
+      # override workunit setting of CEPH_ARGS='--cluster'
+      CEPH_ARGS: ''
+      RBD_MIRROR_INSTANCES: '4'
+      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
+      RBD_MIRROR_CONFIG_KEY: '1'
+      RBD_IMAGE_FEATURES: 'layering,exclusive-lock,journaling'

diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-minimum.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-minimum.yaml
new file mode 100644 (file)
index 0000000..e21d57b
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-minimum.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh]
+    env:
+      # override workunit setting of CEPH_ARGS='--cluster'
+      CEPH_ARGS: ''
+      RBD_MIRROR_INSTANCES: '4'
+      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
+      RBD_MIRROR_CONFIG_KEY: '1'
+      RBD_IMAGE_FEATURES: 'layering'

diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit.yaml
deleted file mode 100644 (file)
index 61b28ca..0000000
--- a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon
-tasks:
-- workunit:
-    clients:
-      cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh]
-    env:
-      # override workunit setting of CEPH_ARGS='--cluster'
-      CEPH_ARGS: ''
-      RBD_MIRROR_INSTANCES: '4'
-      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
-      RBD_MIRROR_CONFIG_KEY: '1'

diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh
index 8eaa6e8e215d24883fc9e5cbcf8fde778adf16b3..1ec70755bbbcefad53ff9963c6d6affd8662c109 100755 (executable)
--- a/qa/workunits/rbd/rbd_mirror_helpers.sh
+++ b/qa/workunits/rbd/rbd_mirror_helpers.sh
@@ -86,6 +86,7 @@ NS1=ns1
 NS2=ns2
 TEMPDIR=
 CEPH_ID=${CEPH_ID:-mirror}
+RBD_IMAGE_FEATURES=${RBD_IMAGE_FEATURES:-layering,exclusive-lock,journaling}
 MIRROR_USER_ID_PREFIX=${MIRROR_USER_ID_PREFIX:-${CEPH_ID}.}
 MIRROR_POOL_MODE=${MIRROR_POOL_MODE:-pool}
 MIRROR_IMAGE_MODE=${MIRROR_IMAGE_MODE:-journal}
@@ -847,7 +848,7 @@ create_image()
     fi
 
     rbd --cluster ${cluster} create --size ${size} \
-        --image-feature layering,exclusive-lock,journaling $@ ${pool}/${image}
+        --image-feature "${RBD_IMAGE_FEATURES}" $@ ${pool}/${image}
 }
 
 create_image_and_enable_mirror()
@@ -957,8 +958,7 @@ clone_image()
 
     rbd --cluster ${cluster} clone \
         ${parent_pool}/${parent_image}@${parent_snap} \
-        ${clone_pool}/${clone_image} \
-        --image-feature layering,exclusive-lock,journaling $@
+        ${clone_pool}/${clone_image} --image-feature "${RBD_IMAGE_FEATURES}" $@
 }
 
 clone_image_and_enable_mirror()