qa/workunits/cephtool/test.sh: fix 'osd thrash' test

- fix the wait check for osds to come back up
- make sure they get marked back in, too

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 21b37f8a71de91b17cf43529de2e60eb2fe72e13..dfe9946416bc1d1a895d4e9d103ba100e62336b0 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -285,14 +285,19 @@ for ((i=0; i < 100; i++)); do
 done
 
 ceph osd thrash 10
+# make sure everything gets back up+in.
 for ((i=0; i < 100; i++)); do
-       if ceph osd dump | grep 'down in'; then
+       if ceph osd dump | grep ' down '; then
                echo "waiting for osd(s) to come back up"
                sleep 10
        else
                break
        fi
 done
+# if you have more osds than this you are on your own
+for f in `seq 0 31`; do
+    ceph osd in $f || true
+done
 
 ceph osd dump | grep 'osd.0 up'
 ceph osd find 1