From: Sage Weil Date: Tue, 5 Feb 2019 11:41:28 +0000 (-0600) Subject: qa/standalone/ceph-helpers: fix health_ok test X-Git-Tag: v13.2.7~156^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f7d9c2e52d43e7ffd5be659d0c9e95dcd7d3060d;p=ceph.git qa/standalone/ceph-helpers: fix health_ok test Stopping the osd daemon won't reliably get you HEALTH_WARN or ERR; you have to make sure it is also marked down. Signed-off-by: Sage Weil (cherry picked from commit dcdca44aa45e7dc5aab56da26caec644e32024a6) --- diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh index d562649ed92e..5d4f205dfcf0 100755 --- a/qa/standalone/ceph-helpers.sh +++ b/qa/standalone/ceph-helpers.sh @@ -1513,6 +1513,7 @@ function test_wait_for_health_ok() { run_osd $dir 1 || return 1 run_osd $dir 2 || return 1 kill_daemons $dir TERM osd || return 1 + ceph osd down 0 || return 1 ! TIMEOUT=1 wait_for_health_ok || return 1 activate_osd $dir 0 || return 1 wait_for_health_ok || return 1