From 7fb99203169cf18b89e900430af946532fac8071 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Tue, 21 Nov 2017 22:29:16 +0200 Subject: [PATCH] qa/workunits/rbd: wait for status propagated only if daemon started Signed-off-by: Mykola Golub --- qa/workunits/rbd/rbd_mirror.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qa/workunits/rbd/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh index 2c2422f82b2..97db53b1fb8 100755 --- a/qa/workunits/rbd/rbd_mirror.sh +++ b/qa/workunits/rbd/rbd_mirror.sh @@ -425,7 +425,9 @@ wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${image} 'up+unknown' promote_image ${CLUSTER1} ${POOL} ${image} write_image ${CLUSTER1} ${POOL} ${image} 10 demote_image ${CLUSTER1} ${POOL} ${image} -wait_for_status_in_pool_dir ${CLUSTER2} ${POOL} ${image} 'up+unknown' +if [ -n "${RBD_MIRROR_USE_RBD_MIRROR}" ]; then + wait_for_status_in_pool_dir ${CLUSTER2} ${POOL} ${image} 'up+unknown' +fi promote_image ${CLUSTER2} ${POOL} ${image} wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${image} 'up+error' 'split-brain' request_resync_image ${CLUSTER1} ${POOL} ${image} image_id -- 2.39.5