From: Ilya Dryomov Date: Wed, 28 Jan 2026 09:41:13 +0000 (+0100) Subject: qa/workunits/rbd: drop randomized sleeps in "big image" tests X-Git-Tag: testing/wip-jcollin-testing-20260217.025616-squid~7^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30bcd88cba21d6b7fb0a1081445972866d5b2f4a;p=ceph-ci.git qa/workunits/rbd: drop randomized sleeps in "big image" tests These tests were tuned for slower hardware than what we have now. Even without these the image is often 25-30% synced by the time the test gets to the "non-primary snapshot in question is still being synced" assert. Fixes: https://tracker.ceph.com/issues/74601 Signed-off-by: Ilya Dryomov (cherry picked from commit ec868d5ca2e56bd6003b002eb5f15d575edabd4e) --- diff --git a/qa/workunits/rbd/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh index db68abbde0b..10f2a126ae9 100755 --- a/qa/workunits/rbd/rbd_mirror.sh +++ b/qa/workunits/rbd/rbd_mirror.sh @@ -768,7 +768,6 @@ if [ "${RBD_MIRROR_MODE}" = "snapshot" ]; then demote_image ${CLUSTER2} ${POOL} ${demote_image} get_newest_complete_mirror_snapshot_id ${CLUSTER2} ${POOL} ${demote_image} primary_snap_id wait_for_non_primary_snap_present ${CLUSTER1} ${POOL} ${demote_image} ${primary_snap_id} - sleep $((RANDOM % 6)) stop_mirrors ${CLUSTER1} -KILL SNAPS=$(get_snaps_json ${CLUSTER1} ${POOL} ${demote_image}) jq -e '.[-1].namespace["type"] == "mirror" and .[-1].namespace["state"] == "demoted" and .[-1].namespace["complete"] == false' <<< ${SNAPS} @@ -801,7 +800,7 @@ if [ "${RBD_MIRROR_MODE}" = "snapshot" ]; then mirror_image_snapshot ${CLUSTER2} ${POOL} ${force_promote_image} fi wait_for_snap_present ${CLUSTER1} ${POOL} ${force_promote_image} 'snap1' -sleep $((1 + RANDOM % 5)) +sleep 1 stop_mirrors ${CLUSTER1} -KILL if [ "${RBD_MIRROR_MODE}" = "snapshot" ]; then SNAPS=$(get_snaps_json ${CLUSTER1} ${POOL} ${force_promote_image})