From 1c8c61897d968bbef982e003c34c3335b7171c52 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 7 Mar 2014 15:21:30 -0800 Subject: [PATCH] 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 Reviewed-by: Dan Mick --- qa/workunits/cephtool/test.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index 21b37f8a71de9..dfe9946416bc1 100755 --- 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