]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/standalone/ceph-helpers: fix health_ok test
authorSage Weil <sage@redhat.com>
Tue, 5 Feb 2019 11:41:28 +0000 (05:41 -0600)
committerNathan Cutler <ncutler@suse.com>
Wed, 16 Oct 2019 10:01:27 +0000 (12:01 +0200)
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>
(cherry picked from commit dcdca44aa45e7dc5aab56da26caec644e32024a6)

qa/standalone/ceph-helpers.sh

index c725904899744223ec96638830f39dfeae1221fd..161fe8f5d9c3773fdd41168e51544bdba937776c 100755 (executable)
@@ -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