import 15.2.0 Octopus source

[ceph.git] / ceph / qa / workunits / rbd / rbd_mirror_stress.sh

diff --git a/ceph/qa/workunits/rbd/rbd_mirror_stress.sh b/ceph/qa/workunits/rbd/rbd_mirror_stress.sh
index a1d7d03470a61c858a22af319419a31ab3cfe6e1..cb4f66b256c4f44a8e688add332c13f8570c9e8e 100755 (executable)
--- a/ceph/qa/workunits/rbd/rbd_mirror_stress.sh
+++ b/ceph/qa/workunits/rbd/rbd_mirror_stress.sh
@@ -77,7 +77,7 @@ wait_for_pool_healthy()
 
     for s in `seq 1 40`; do
         test $s -ne 1 && sleep 30
-        state=$(rbd --cluster ${cluster} -p ${pool} mirror pool status | grep 'health:' | cut -d' ' -f 2)
+        state=$(rbd --cluster ${cluster} -p ${pool} mirror pool status | grep 'image health:' | cut -d' ' -f 3)
         test "${state}" = "ERROR" && break
         test "${state}" = "OK" && return 0
     done
@@ -97,7 +97,7 @@ for i in `seq 1 10`
 do
   stress_write_image ${CLUSTER2} ${POOL} ${image}
 
-  wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${image} 'up+replaying' 'master_position'
+  wait_for_status_in_pool_dir ${CLUSTER1} ${POOL} ${image} 'up+replaying'
 
   snap_name="snap${i}"
   create_snap ${CLUSTER2} ${POOL} ${image} ${snap_name}