qa/workunits/rest/test.py: do not test 'osd thrash'

This wreaks havoc on our QA because it marks osds up and down and then
immediately after that we try to scrub and some osds are still down.

Adjust the CLI test to wait for all OSDs to come back up after thrashing.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 0a65494a2e766e3a8c1c4a743c882f238421baba..21b37f8a71de91b17cf43529de2e60eb2fe72e13 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -283,6 +283,17 @@ for ((i=0; i < 100; i++)); do
                break
        fi
 done
+
+ceph osd thrash 10
+for ((i=0; i < 100; i++)); do
+       if ceph osd dump | grep 'down in'; then
+               echo "waiting for osd(s) to come back up"
+               sleep 10
+       else
+               break
+       fi
+done
+
 ceph osd dump | grep 'osd.0 up'
 ceph osd find 1
 ceph osd metadata 1 | grep 'distro'
@@ -453,8 +464,6 @@ ceph osd pool set rbd cache_min_evict_age 234
 
 ceph osd pool get rbd crush_ruleset | grep 'crush_ruleset: 0'
 
-ceph osd thrash 10
-
 
 
 set +e

diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py
index efedcb880ac8d7d1aac3719d8671f7328484b6a3..2bf97718a4fc190fbdf7ce70f2043820aacfc5e4 100755 (executable)
--- a/qa/workunits/rest/test.py
+++ b/qa/workunits/rest/test.py
@@ -431,5 +431,4 @@ if __name__ == '__main__':
     r = expect('osd/pool/get.json?pool=rbd&var=crush_ruleset', 'GET', 200, 'json')
     assert(r.myjson['output']['crush_ruleset'] == 0)
 
-    expect('osd/thrash?num_epochs=10', 'PUT', 200, '')
     print 'OK'