From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Feb 2019 11:41:28 +0000 (-0600)
Subject: qa/standalone/ceph-helpers: fix health_ok test
X-Git-Tag: v14.1.0~183^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcdca44aa45e7dc5aab56da26caec644e32024a6;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 <sage@redhat.com>
---

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index 1a613c34fa79..3ed25aeddbbf 100755
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -1597,6 +1597,7 @@ function test_wait_for_health_ok() {
     run_mgr $dir x --mon_pg_warn_min_per_osd=0 || return 1
     run_osd $dir 0 || 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