From: VinayBhaskar-V Date: Tue, 21 Oct 2025 07:04:40 +0000 (+0530) Subject: qa/workunits/rbd: moving mirror_image_snapshot to wait_for_replay_complete X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4168074508624bda97fbe374f0c76e5b64c5b6e;p=ceph.git qa/workunits/rbd: moving mirror_image_snapshot to wait_for_replay_complete to make wait_for_snapshot_sync_complete work for all cases. Signed-off-by: VinayBhaskar-V --- diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh index 2c2b0c7d6bc..84eeccf1cbb 100755 --- a/qa/workunits/rbd/rbd_mirror_helpers.sh +++ b/qa/workunits/rbd/rbd_mirror_helpers.sh @@ -806,7 +806,6 @@ wait_for_snapshot_sync_complete() local status_log=${TEMPDIR}/$(mkfname ${cluster}-${remote_pool}-${image}.status) local local_status_log=${TEMPDIR}/$(mkfname ${local_cluster}-${local_pool}-${image}.status) - mirror_image_snapshot "${cluster}" "${remote_pool}" "${image}" get_newest_mirror_snapshot "${cluster}" "${remote_pool}" "${image}" "${status_log}" local snapshot_id=$(xmlstarlet sel -t -v "//snapshot/id" < ${status_log}) @@ -836,6 +835,7 @@ wait_for_replay_complete() if [ "${RBD_MIRROR_MODE}" = "journal" ]; then wait_for_journal_replay_complete ${local_cluster} ${cluster} ${local_pool} ${remote_pool} ${image} elif [ "${RBD_MIRROR_MODE}" = "snapshot" ]; then + mirror_image_snapshot "${cluster}" "${remote_pool}" "${image}" wait_for_snapshot_sync_complete ${local_cluster} ${cluster} ${local_pool} ${remote_pool} ${image} else return 1