]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/rbd: wait for status propagated only if daemon started 19082/head
authorMykola Golub <to.my.trociny@gmail.com>
Tue, 21 Nov 2017 20:29:16 +0000 (22:29 +0200)
committerMykola Golub <to.my.trociny@gmail.com>
Tue, 21 Nov 2017 20:29:16 +0000 (22:29 +0200)
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
qa/workunits/rbd/rbd_mirror.sh

index 2c2422f82b2bc5a7facaaafb031c57326cd69c67..97db53b1fb88a935d50b273b8ff80bfc15747c6c 100755 (executable)
@@ -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