From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 18 May 2016 18:17:13 +0000 (-0400)
Subject: qa/workunits/rbd: fixed rbd_mirror teuthology runtime errors
X-Git-Tag: v10.2.2~54^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e0dfc55ac874f2531bd0b88aa1c81156d7f7aec9;p=ceph.git

qa/workunits/rbd: fixed rbd_mirror teuthology runtime errors

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 8ef09c4d8d3c7c6fbc9b6f7ef17cca0179e73468)
---

diff --git a/qa/workunits/rbd/rbd_mirror.sh b/qa/workunits/rbd/rbd_mirror.sh
index e4301fa8a1e8d..d65a161ad6578 100755
--- a/qa/workunits/rbd/rbd_mirror.sh
+++ b/qa/workunits/rbd/rbd_mirror.sh
@@ -71,9 +71,9 @@ TEMPDIR=
 # by default.
 #
 # RBD_MIRROR_USE_EXISTING_CLUSTER - if set, do not start and stop ceph clusters
-# RBD_MIRROR_USE_EXISTING_DAEMON - if set, use an existing instance of rbd-mirror
-#                                  running as ceph client $CEPH_ID. If empty,
-#                                  this script will start and stop rbd-mirror
+# RBD_MIRROR_USE_RBD_MIRROR - if set, use an existing instance of rbd-mirror
+#                             running as ceph client $CEPH_ID. If empty,
+#                             this script will start and stop rbd-mirror
 
 #
 # Functions
@@ -492,7 +492,9 @@ wait_for_image_replay_started ${CLUSTER1} ${image}
 write_image ${CLUSTER2} ${image} 100
 wait_for_replay_complete ${CLUSTER1} ${CLUSTER2} ${image}
 test_status_in_pool_dir ${CLUSTER1} ${image} 'up+replaying' 'master_position'
-test_status_in_pool_dir ${CLUSTER2} ${image} 'down+unknown'
+if [ -z "${RBD_MIRROR_USE_RBD_MIRROR}" ]; then
+  test_status_in_pool_dir ${CLUSTER2} ${image} 'down+unknown'
+fi
 compare_images ${image}
 
 testlog "TEST: stop mirror, add image, start mirror and test replay"
@@ -504,7 +506,9 @@ start_mirror ${CLUSTER1}
 wait_for_image_replay_started ${CLUSTER1} ${image1}
 wait_for_replay_complete ${CLUSTER1} ${CLUSTER2} ${image1}
 test_status_in_pool_dir ${CLUSTER1} ${image1} 'up+replaying' 'master_position'
-test_status_in_pool_dir ${CLUSTER2} ${image1} 'down+unknown'
+if [ -z "${RBD_MIRROR_USE_RBD_MIRROR}" ]; then
+  test_status_in_pool_dir ${CLUSTER2} ${image1} 'down+unknown'
+fi
 compare_images ${image1}
 
 testlog "TEST: test the first image is replaying after restart"
diff --git a/qa/workunits/rbd/rbd_mirror_stress.sh b/qa/workunits/rbd/rbd_mirror_stress.sh
index 332dc1194fa35..b9f130215904d 100755
--- a/qa/workunits/rbd/rbd_mirror_stress.sh
+++ b/qa/workunits/rbd/rbd_mirror_stress.sh
@@ -71,10 +71,9 @@ TEMPDIR=
 # by default.
 #
 # RBD_MIRROR_USE_EXISTING_CLUSTER - if set, do not start and stop ceph clusters
-# RBD_MIRROR_USE_EXISTING_DAEMON - if set, use an existing instance of rbd-mirror
-#                                  running as ceph client $CEPH_ID. If empty,
-#                                  this script will start and stop rbd-mirror
-
+# RBD_MIRROR_USE_RBD_MIRROR - if set, use an existing instance of rbd-mirror
+#                             running as ceph client $CEPH_ID. If empty,
+#                             this script will start and stop rbd-mirror
 #
 # Functions
 #