From: Mykola Golub <mgolub@mirantis.com>
Date: Mon, 3 Oct 2016 14:02:59 +0000 (+0300)
Subject: qa/workunits/rbd: set image-meta on primary image and wait it is replicated
X-Git-Tag: v11.0.1~41^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=eb4097b8ef4f97dedf4f28cee056fe5a89fbffe2;p=ceph-ci.git

qa/workunits/rbd: set image-meta on primary image and wait it is replicated

After recently added image metadata replication it is not possible any
more to update it on non-primary image.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/qa/workunits/rbd/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh
index 361c78fc4b4..aaa7755d99c 100755
--- a/qa/workunits/rbd/rbd_mirror.sh
+++ b/qa/workunits/rbd/rbd_mirror.sh
@@ -321,16 +321,18 @@ test -n "$(get_mirror_position ${CLUSTER2} ${POOL} ${image})"
 compare_images ${POOL} ${image}
 
 testlog " - rbd_mirroring_resync_after_disconnect config option"
-set_image_meta ${CLUSTER1} ${POOL} ${image} \
+set_image_meta ${CLUSTER2} ${POOL} ${image} \
 	       conf_rbd_mirroring_resync_after_disconnect true
+wait_for_replay_complete ${CLUSTER1} ${CLUSTER2} ${POOL} ${image}
 disconnect_image ${CLUSTER2} ${POOL} ${image}
 wait_for_image_present ${CLUSTER1} ${POOL} ${image} 'deleted'
 wait_for_image_replay_started ${CLUSTER1} ${POOL} ${image}
 wait_for_replay_complete ${CLUSTER1} ${CLUSTER2} ${POOL} ${image}
 test -n "$(get_mirror_position ${CLUSTER2} ${POOL} ${image})"
 compare_images ${POOL} ${image}
-set_image_meta ${CLUSTER1} ${POOL} ${image} \
+set_image_meta ${CLUSTER2} ${POOL} ${image} \
 	       conf_rbd_mirroring_resync_after_disconnect false
+wait_for_replay_complete ${CLUSTER1} ${CLUSTER2} ${POOL} ${image}
 disconnect_image ${CLUSTER2} ${POOL} ${image}
 test -z "$(get_mirror_position ${CLUSTER2} ${POOL} ${image})"
 wait_for_image_replay_stopped ${CLUSTER1} ${POOL} ${image}