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 <loic@dachary.org>

diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh
index 242521cc5be31b9f05f29034b50d1d4af38a6dc3..65b8a6834023759c710867327f00e169f5d98d57 100755 (executable)
--- 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)