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 <[email protected]>
Reviewed-by: Dan Mick <[email protected]>

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