LU-5986 test: Ensure correct start for conf-sanity/84

For review-zfs:
1) test 79 fails to reformat nodes
2) test 80 fails silently
3) test 84 chokes

Fix test 79 to reformat at end and fix 80 die when it should.

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: I42c635fffd89eda9ccd6f3f9d739ff8ac75afcf6
Reviewed-on: http://review.whamcloud.com/13016
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index bd951fd..6f864fd 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -4842,20 +4842,20 @@ test_79() { # LU-4227
        add ost1 $opts_ost1 $ostdev1 $ostvdev2 &&
                error "Must specify --mgsnode when formatting an ost"
 
-       return 0
+       reformat
 }
 run_test 79 "format MDT/OST without mgs option (should return errors)"
 
 test_80() {
-       start_mds
-       start_ost
+       start_mds || error "Failed to start MDT"
+       start_ost || error "Failed to start OST1"
        uuid=$(do_facet ost1 $LCTL get_param -n mgc.*.uuid)
 #define OBD_FAIL_MGS_PAUSE_TARGET_CON       0x906
        do_facet ost1 "$LCTL set_param fail_val=10 fail_loc=0x906"
        do_facet mgs "$LCTL set_param fail_val=10 fail_loc=0x906"
        do_facet mgs "$LCTL set_param -n mgs/MGS/evict_client $uuid"
        sleep 30
-       start_ost2
+       start_ost2 || error "Failed to start OST2"
 
        do_facet ost1 "$LCTL set_param fail_loc=0"
        stopall