From: Mykola Golub <to.my.trociny@gmail.com>
Date: Tue, 21 Nov 2017 20:29:16 +0000 (+0200)
Subject: qa/workunits/rbd: wait for status propagated only if daemon started
X-Git-Tag: v13.0.1~120^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7fb99203169cf18b89e900430af946532fac8071;p=ceph-ci.git

qa/workunits/rbd: wait for status propagated only if daemon started

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
---

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