From: Ning Yao Date: Thu, 10 Dec 2015 07:36:33 +0000 (+0800) Subject: tests: fix failure for osd-scrub-snap.sh X-Git-Tag: v10.0.2~52^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6890%2Fhead;p=ceph.git tests: fix failure for osd-scrub-snap.sh Reason to get a false negative only one osd, when calling kill_daemons $dir KILL osd, which means kill -9 shutdown() would not be called to notify monitor so that it remain active+clean and osd up until monitor got a mon_report timeout. Thus wait_for_clean lose it function and when we call ceph pg scrub, we got an EAGAIN error and monitor will ignore the scrub message because of osd not up Signed-off-by: Ning Yao --- diff --git a/src/test/osd/osd-scrub-snaps.sh b/src/test/osd/osd-scrub-snaps.sh index 7c1a587ccb91..bf59570b9f51 100755 --- a/src/test/osd/osd-scrub-snaps.sh +++ b/src/test/osd/osd-scrub-snaps.sh @@ -92,8 +92,7 @@ function TEST_scrub_snaps() { rados -p $poolname rm obj4 rados -p $poolname rm obj2 - kill_daemons $dir KILL osd || return 1 - sleep 5 + kill_daemons $dir TERM osd || return 1 # Don't need to ceph_objectstore_tool function because osd stopped