From 3a62d166a7af5a62d5210417a5c10f101ce75229 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 23 Nov 2019 08:55:00 -0600 Subject: [PATCH] qa/standalone/ceph-helpers.sh: remove osd down check A kill doesn't induce a mark-down of the OSD with osd_fast_shutdown=true. Signed-off-by: Sage Weil --- qa/standalone/ceph-helpers.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh index b367f951584..c4efcd8bf8f 100755 --- a/qa/standalone/ceph-helpers.sh +++ b/qa/standalone/ceph-helpers.sh @@ -293,8 +293,6 @@ function test_kill_daemon() { kill_daemon $pidfile TERM || return 1 done - ceph osd dump | grep "osd.0 down" || return 1 - name_prefix=mgr for pidfile in $(find $dir 2>/dev/null | grep $name_prefix'[^/]*\.pid') ; do # @@ -381,7 +379,6 @@ function test_kill_daemons() { # killing just the osd and verify the mon still is responsive # kill_daemons $dir TERM osd || return 1 - ceph osd dump | grep "osd.0 down" || return 1 # # kill the mgr # @@ -936,8 +933,10 @@ function test_wait_for_osd() { run_mon $dir a --osd_pool_default_size=1 || return 1 run_mgr $dir x || return 1 run_osd $dir 0 || return 1 + run_osd $dir 1 || return 1 wait_for_osd up 0 || return 1 - kill_daemons $dir TERM osd || return 1 + wait_for_osd up 1 || return 1 + kill_daemons $dir TERM osd.0 || return 1 wait_for_osd down 0 || return 1 ( TIMEOUT=1 ; ! wait_for_osd up 0 ) || return 1 teardown $dir || return 1 -- 2.39.5