qa/workunits/cephtool/test.sh: fix thrash (ultimate)

Keep the osd trash test to ensure it is a valid command but make it a
noop by giving it a zero argument (meaning thrash 0 OSD maps).

Remove the loops that were added after the command in an attempt to wait
for the cluster to recover and not pollute the rest of the tests. Actual
testing of osd thrash would require a dedicated cluster because it the
side effects are random and it is unnecessarily difficult to ensure they
are finished.

http://tracker.ceph.com/issues/9620 Fixes: #9620

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit beade63a17db2e6fc68d1f55332d602f8f7cb93a)

Conflicts:
	qa/workunits/cephtool/test.sh

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index ac52396e6013d3da690df56d873404f2bdd36140..20f6319d300286ab5633d620c6ffbfa6aca4d9ab 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -457,21 +457,7 @@ function test_mon_osd()
     fi
   done
 
-  ceph osd thrash 10
-  ceph osd down `seq 0 31`  # force everything down so that we can trust up
-  # make sure everything gets back up+in.
-  for ((i=0; i < 100; i++)); do
-    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 thrash 0
 
   ceph osd dump | grep 'osd.0 up'
   ceph osd find 1