From 366e9c51a8d83a7c185a00d9fb9e4cde290145e4 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Fri, 24 Sep 2021 12:29:34 +0200 Subject: [PATCH] qa/suites/rbd: test case for one-way snapshot-based mirroring Signed-off-by: Ilya Dryomov --- ...l => rbd-mirror-journal-bootstrap-workunit.yaml} | 2 ++ .../rbd-mirror-snapshot-bootstrap-workunit.yaml | 13 +++++++++++++ qa/workunits/rbd/rbd_mirror_bootstrap.sh | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) rename qa/suites/rbd/mirror/workloads/{rbd-mirror-bootstrap-workunit.yaml => rbd-mirror-journal-bootstrap-workunit.yaml} (83%) create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-bootstrap-workunit.yaml diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-bootstrap-workunit.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml similarity index 83% rename from qa/suites/rbd/mirror/workloads/rbd-mirror-bootstrap-workunit.yaml rename to qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml index 585f582913f7c..b9c5562be834d 100644 --- a/qa/suites/rbd/mirror/workloads/rbd-mirror-bootstrap-workunit.yaml +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml @@ -9,3 +9,5 @@ tasks: CEPH_ARGS: '' RBD_MIRROR_INSTANCES: '1' RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + MIRROR_POOL_MODE: 'pool' + MIRROR_IMAGE_MODE: 'journal' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-bootstrap-workunit.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-bootstrap-workunit.yaml new file mode 100644 index 0000000000000..5ad78474d3cb2 --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-bootstrap-workunit.yaml @@ -0,0 +1,13 @@ +meta: +- desc: run the rbd_mirror_bootstrap.sh workunit to test the rbd-mirror daemon +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_bootstrap.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_INSTANCES: '1' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + MIRROR_POOL_MODE: 'image' + MIRROR_IMAGE_MODE: 'snapshot' diff --git a/qa/workunits/rbd/rbd_mirror_bootstrap.sh b/qa/workunits/rbd/rbd_mirror_bootstrap.sh index e0a096ee8a370..fb77c0d9bf869 100755 --- a/qa/workunits/rbd/rbd_mirror_bootstrap.sh +++ b/qa/workunits/rbd/rbd_mirror_bootstrap.sh @@ -27,7 +27,7 @@ testlog "TEST: verify rx-only direction" [ "$(rbd --cluster ${CLUSTER1} --pool ${POOL} mirror pool info --format xml | ${XMLSTARLET} sel -t -v '//mirror/peers/peer[1]/uuid')" = "" ] -create_image ${CLUSTER1} ${POOL} image1 +create_image_and_enable_mirror ${CLUSTER1} ${POOL} image1 wait_for_image_replay_started ${CLUSTER2} ${POOL} image1 write_image ${CLUSTER1} ${POOL} image1 100 -- 2.39.5