qa/workunits/rbd: wait for replaying status in bootstrap tests

wait_for_replay_complete() doesn't wait for image status to get
updated.  This didn't matter previously because these tests are run on
two different pools and nothing else was following.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d1d848276f0a33b20482321088c8c7470a84d0b3)

Conflicts:
	qa/workunits/rbd/rbd_mirror_bootstrap.sh [ commit 3fd8a0388735
	  ("qa/workunits/rbd: merge journal and snapshot test scripts")
	  not in reef ]

diff --git a/qa/workunits/rbd/rbd_mirror_bootstrap.sh b/qa/workunits/rbd/rbd_mirror_bootstrap.sh
index b1aeeaac9272f25deb0cef702811c52b4084bc29..28f9d7c80f1199ec4084d9ab51cb58e0aaa4111e 100755 (executable)
--- a/qa/workunits/rbd/rbd_mirror_bootstrap.sh
+++ b/qa/workunits/rbd/rbd_mirror_bootstrap.sh
@@ -39,6 +39,7 @@ create_image_and_enable_mirror ${CLUSTER1} ${POOL} image1
 wait_for_image_replay_started ${CLUSTER2} ${POOL} image1
 write_image ${CLUSTER1} ${POOL} image1 100
 wait_for_replay_complete ${CLUSTER2} ${CLUSTER1} ${POOL} image1
+wait_for_status_in_pool_dir ${CLUSTER2} ${POOL} image1 'up+replaying'
 
 testlog "TEST: verify rx-tx direction"
 # both rx-tx peers are added immediately by "rbd mirror pool peer bootstrap import"
@@ -54,10 +55,12 @@ enable_mirror ${CLUSTER2} ${PARENT_POOL} image2
 wait_for_image_replay_started ${CLUSTER2} ${PARENT_POOL} image1
 write_image ${CLUSTER1} ${PARENT_POOL} image1 100
 wait_for_replay_complete ${CLUSTER2} ${CLUSTER1} ${PARENT_POOL} image1
+wait_for_status_in_pool_dir ${CLUSTER2} ${PARENT_POOL} image1 'up+replaying'
 
 wait_for_image_replay_started ${CLUSTER1} ${PARENT_POOL} image2
 write_image ${CLUSTER2} ${PARENT_POOL} image2 100
 wait_for_replay_complete ${CLUSTER1} ${CLUSTER2} ${PARENT_POOL} image2
+wait_for_status_in_pool_dir ${CLUSTER1} ${PARENT_POOL} image2 'up+replaying'
 
 testlog "TEST: pool replayer and callout cleanup when peer is updated"
 test_health_state ${CLUSTER1} ${PARENT_POOL} 'OK'