From 9b773eec4a8c343894ba727e05ec89e39e6cf685 Mon Sep 17 00:00:00 2001 From: Suyashd999 Date: Tue, 14 Nov 2023 12:59:13 +0530 Subject: [PATCH] qa/suites/rbd: Cleanup of MIRROR_IMAGE_MODE Fixes: https://tracker.ceph.com/issues/63431 Signed-off-by: Suyash Dongre --- .../rbd-mirror-journal-stress-workunit.yaml | 2 +- ...ror-snapshot-stress-workunit-exclusive-lock.yaml | 2 +- ...d-mirror-snapshot-stress-workunit-fast-diff.yaml | 2 +- ...rbd-mirror-snapshot-stress-workunit-minimum.yaml | 2 +- .../rbd-mirror-journal-bootstrap-workunit.yaml | 2 +- .../rbd-mirror-snapshot-bootstrap-workunit.yaml | 2 +- qa/workunits/rbd/rbd_mirror_helpers.sh | 13 ++++++------- qa/workunits/rbd/rbd_mirror_stress.sh | 4 ++-- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-journal-stress-workunit.yaml b/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-journal-stress-workunit.yaml index 9579b70d62c0c..4b85b483af46c 100644 --- a/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-journal-stress-workunit.yaml +++ b/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-journal-stress-workunit.yaml @@ -11,5 +11,5 @@ tasks: RBD_MIRROR_USE_EXISTING_CLUSTER: '1' RBD_MIRROR_USE_RBD_MIRROR: '1' MIRROR_POOL_MODE: 'pool' - MIRROR_IMAGE_MODE: 'journal' + RBD_MIRROR_MODE: 'journal' timeout: 6h diff --git a/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-exclusive-lock.yaml b/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-exclusive-lock.yaml index 87632483d1cbb..4b9225bdcba9a 100644 --- a/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-exclusive-lock.yaml +++ b/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-exclusive-lock.yaml @@ -8,7 +8,7 @@ tasks: # override workunit setting of CEPH_ARGS='--cluster' CEPH_ARGS: '' MIRROR_POOL_MODE: 'image' - MIRROR_IMAGE_MODE: 'snapshot' + RBD_MIRROR_MODE: 'snapshot' RBD_IMAGE_FEATURES: 'layering,exclusive-lock' RBD_MIRROR_INSTANCES: '4' RBD_MIRROR_USE_EXISTING_CLUSTER: '1' diff --git a/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-fast-diff.yaml b/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-fast-diff.yaml index fc43b0ec24d76..756fc9c741eb3 100644 --- a/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-fast-diff.yaml +++ b/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-fast-diff.yaml @@ -8,7 +8,7 @@ tasks: # override workunit setting of CEPH_ARGS='--cluster' CEPH_ARGS: '' MIRROR_POOL_MODE: 'image' - MIRROR_IMAGE_MODE: 'snapshot' + RBD_MIRROR_MODE: 'snapshot' RBD_IMAGE_FEATURES: 'layering,exclusive-lock,object-map,fast-diff' RBD_MIRROR_INSTANCES: '4' RBD_MIRROR_USE_EXISTING_CLUSTER: '1' diff --git a/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-minimum.yaml b/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-minimum.yaml index af0ea12408bdc..cc18601f3d8ca 100644 --- a/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-minimum.yaml +++ b/qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-snapshot-stress-workunit-minimum.yaml @@ -8,7 +8,7 @@ tasks: # override workunit setting of CEPH_ARGS='--cluster' CEPH_ARGS: '' MIRROR_POOL_MODE: 'image' - MIRROR_IMAGE_MODE: 'snapshot' + RBD_MIRROR_MODE: 'snapshot' RBD_IMAGE_FEATURES: 'layering' RBD_MIRROR_INSTANCES: '4' RBD_MIRROR_USE_EXISTING_CLUSTER: '1' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml index b9c5562be834d..e129374af25ea 100644 --- a/qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml @@ -10,4 +10,4 @@ tasks: RBD_MIRROR_INSTANCES: '1' RBD_MIRROR_USE_EXISTING_CLUSTER: '1' MIRROR_POOL_MODE: 'pool' - MIRROR_IMAGE_MODE: 'journal' + RBD_MIRROR_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 index 5ad78474d3cb2..9507c6ddc843e 100644 --- a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-bootstrap-workunit.yaml +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-bootstrap-workunit.yaml @@ -10,4 +10,4 @@ tasks: RBD_MIRROR_INSTANCES: '1' RBD_MIRROR_USE_EXISTING_CLUSTER: '1' MIRROR_POOL_MODE: 'image' - MIRROR_IMAGE_MODE: 'snapshot' + RBD_MIRROR_MODE: 'snapshot' diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh index 7183a2cba258e..f7a3e5de0d998 100755 --- a/qa/workunits/rbd/rbd_mirror_helpers.sh +++ b/qa/workunits/rbd/rbd_mirror_helpers.sh @@ -94,11 +94,10 @@ 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}.} +RBD_MIRROR_MODE=${RBD_MIRROR_MODE:-journal} MIRROR_POOL_MODE=${MIRROR_POOL_MODE:-pool} -MIRROR_IMAGE_MODE=${MIRROR_IMAGE_MODE:-journal} if [ "${RBD_MIRROR_MODE}" = "snapshot" ]; then MIRROR_POOL_MODE=image - MIRROR_IMAGE_MODE=snapshot fi export CEPH_ARGS="--id ${CEPH_ID}" @@ -805,9 +804,9 @@ wait_for_replay_complete() local pool=$3 local image=$4 - if [ "${MIRROR_IMAGE_MODE}" = "journal" ]; then + if [ "${RBD_MIRROR_MODE}" = "journal" ]; then wait_for_journal_replay_complete ${local_cluster} ${cluster} ${pool} ${image} - elif [ "${MIRROR_IMAGE_MODE}" = "snapshot" ]; then + elif [ "${RBD_MIRROR_MODE}" = "snapshot" ]; then wait_for_snapshot_sync_complete ${local_cluster} ${cluster} ${pool} ${image} else return 1 @@ -942,7 +941,7 @@ create_image_and_enable_mirror() local cluster=$1 ; shift local pool=$1 ; shift local image=$1 ; shift - local mode=${1:-${MIRROR_IMAGE_MODE}} + local mode=${1:-${RBD_MIRROR_MODE}} if [ -n "$1" ]; then shift fi @@ -1064,7 +1063,7 @@ clone_image_and_enable_mirror() local clone_image=$6 shift 6 - local mode=${1:-${MIRROR_IMAGE_MODE}} + local mode=${1:-${RBD_MIRROR_MODE}} if [ -n "$1" ]; then shift fi @@ -1363,7 +1362,7 @@ enable_mirror() local cluster=$1 local pool=$2 local image=$3 - local mode=${4:-${MIRROR_IMAGE_MODE}} + local mode=${4:-${RBD_MIRROR_MODE}} rbd --cluster=${cluster} mirror image enable ${pool}/${image} ${mode} # Display image info including the global image id for debugging purpose diff --git a/qa/workunits/rbd/rbd_mirror_stress.sh b/qa/workunits/rbd/rbd_mirror_stress.sh index cb79aba7ebc9c..5426f495db10c 100755 --- a/qa/workunits/rbd/rbd_mirror_stress.sh +++ b/qa/workunits/rbd/rbd_mirror_stress.sh @@ -96,7 +96,7 @@ start_mirrors ${CLUSTER2} testlog "TEST: add image and test replay after client crashes" image=test -create_image_and_enable_mirror ${CLUSTER2} ${POOL} ${image} ${MIRROR_IMAGE_MODE} '512M' +create_image_and_enable_mirror ${CLUSTER2} ${POOL} ${image} ${RBD_MIRROR_MODE} '512M' wait_for_image_replay_started ${CLUSTER1} ${POOL} ${image} clean_snap_name= @@ -151,7 +151,7 @@ snap_name="snap" for i in `seq 1 ${IMAGE_COUNT}` do image="image_${i}" - create_image_and_enable_mirror ${CLUSTER2} ${POOL} ${image} ${MIRROR_IMAGE_MODE} '128M' + create_image_and_enable_mirror ${CLUSTER2} ${POOL} ${image} ${RBD_MIRROR_MODE} '128M' if [ -n "${RBD_MIRROR_REDUCE_WRITES}" ]; then write_image ${CLUSTER2} ${POOL} ${image} 100 else -- 2.39.5