From 9ad8ce28390060d8309e721d42d46d2ec916f23d Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 24 Nov 2016 07:52:56 +0100 Subject: [PATCH] tests: osd-scrub-repair.sh abort if add_something fails If the script keeps going after this function fails, it will be non trivial to find the root cause of the problem. Signed-off-by: Loic Dachary --- src/test/osd/osd-scrub-repair.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh index 242521cc5be31..65b8a68340237 100755 --- a/src/test/osd/osd-scrub-repair.sh +++ b/src/test/osd/osd-scrub-repair.sh @@ -72,7 +72,7 @@ function TEST_corrupt_and_repair_replicated() { run_osd $dir 1 || return 1 wait_for_clean || return 1 - add_something $dir $poolname + add_something $dir $poolname || return 1 corrupt_and_repair_one $dir $poolname $(get_not_primary $poolname SOMETHING) || return 1 # Reproduces http://tracker.ceph.com/issues/8914 corrupt_and_repair_one $dir $poolname $(get_primary $poolname SOMETHING) || return 1 @@ -152,7 +152,7 @@ function corrupt_and_repair_erasure_coded() { || return 1 wait_for_clean || return 1 - add_something $dir $poolname + add_something $dir $poolname || return 1 local primary=$(get_primary $poolname SOMETHING) local -a osds=($(get_osds $poolname SOMETHING | sed -e "s/$primary//")) @@ -272,7 +272,7 @@ function TEST_unfound_erasure_coded() { || return 1 wait_for_clean || return 1 - add_something $dir $poolname + add_something $dir $poolname || return 1 local primary=$(get_primary $poolname SOMETHING) local -a osds=($(get_osds $poolname SOMETHING | sed -e "s/$primary//")) @@ -393,7 +393,7 @@ function TEST_corrupt_scrub_replicated() { for i in $(seq 1 $total_objs) ; do objname=ROBJ${i} - add_something $dir $poolname $objname + add_something $dir $poolname $objname || return 1 rados --pool $poolname setomapheader $objname hdr-$objname || return 1 rados --pool $poolname setomapval $objname key-$objname val-$objname || return 1 @@ -1513,7 +1513,7 @@ function TEST_corrupt_scrub_erasure() { for i in $(seq 1 $total_objs) ; do objname=EOBJ${i} - add_something $dir $poolname $objname + add_something $dir $poolname $objname || return 1 local osd=$(expr $i % 2) -- 2.39.5