From: David Zafman <dzafman@redhat.com>
Date: Mon, 1 Oct 2018 18:17:45 +0000 (-0700)
Subject: test: Make sure kill_daemons failure will be easy to find
X-Git-Tag: v14.0.1~4^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24651%2Fhead;p=ceph.git

test: Make sure kill_daemons failure will be easy to find

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/qa/standalone/osd/pg-split-merge.sh b/qa/standalone/osd/pg-split-merge.sh
index 5aabd7f59157..7e9b8ed8b73c 100755
--- a/qa/standalone/osd/pg-split-merge.sh
+++ b/qa/standalone/osd/pg-split-merge.sh
@@ -28,7 +28,7 @@ function TEST_import_after_merge_and_gap() {
     wait_for_clean || return 1
     rados -p foo bench 3 write -b 1024 --no-cleanup || return 1
 
-    kill_daemons $dir TERM osd.0
+    kill_daemons $dir TERM osd.0 || return 1
     ceph-objectstore-tool --data-path $dir/0 --op export --pgid 1.1 --file $dir/1.1  --force || return 1
     ceph-objectstore-tool --data-path $dir/0 --op export --pgid 1.0 --file $dir/1.0  --force || return 1
     activate_osd $dir 0 || return 1
@@ -39,7 +39,7 @@ function TEST_import_after_merge_and_gap() {
     wait_for_clean || return 1
 
     #
-    kill_daemons $dir TERM osd.0
+    kill_daemons $dir TERM osd.0 || return 1
     ceph-objectstore-tool --data-path $dir/0 --op remove --pgid 1.0 --force || return 1
     # this will import both halves the original pg
     ceph-objectstore-tool --data-path $dir/0 --op import --pgid 1.1 --file $dir/1.1 || return 1
@@ -58,7 +58,7 @@ function TEST_import_after_merge_and_gap() {
     sleep 3
     wait_for_clean || return 1
 
-    kill_daemons $dir TERM osd.0
+    kill_daemons $dir TERM osd.0 || return 1
 
     # this should fail.. 1.1 still doesn't exist
     ! ceph-objectstore-tool --data-path $dir/0 --op import --pgid 1.1 --file $dir/1.1 || return 1
@@ -85,7 +85,7 @@ function TEST_import_after_split() {
     wait_for_clean || return 1
     rados -p foo bench 3 write -b 1024 --no-cleanup || return 1
 
-    kill_daemons $dir TERM osd.0
+    kill_daemons $dir TERM osd.0 || return 1
     ceph-objectstore-tool --data-path $dir/0 --op export --pgid 1.0 --file $dir/1.0  --force || return 1
     activate_osd $dir 0 || return 1
 
@@ -94,7 +94,7 @@ function TEST_import_after_split() {
     while ceph daemon osd.0 perf dump | jq '.osd.numpg' | grep 1 ; do sleep 1 ; done
     wait_for_clean || return 1
 
-    kill_daemons $dir TERM osd.0
+    kill_daemons $dir TERM osd.0 || return 1
 
     ceph-objectstore-tool --data-path $dir/0 --op remove --pgid 1.0 --force || return 1