LU-10288 lfsck: layout LFSCK for mirrored file

[fs/lustre-release.git] / lustre / tests / insanity.sh

diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh
index 32701f9..37f2f66 100755 (executable)
--- a/lustre/tests/insanity.sh
+++ b/lustre/tests/insanity.sh
@@ -19,7 +19,6 @@ ALWAYS_EXCEPT="15  $INSANITY_EXCEPT"
 if [ "$FAILURE_MODE" = "HARD" ]; then
        skip_env "$TESTSUITE: is not functional with FAILURE_MODE = HARD, " \
                "please use recovery-double-scale, bz20407"
-       exit 0
 fi
 
 [ "$SLOW" = "no" ] && EXCEPT_SLOW=""
@@ -171,7 +170,7 @@ run_test 0 "Fail all nodes, independently"
 
 ############### First Failure Mode ###############
 test_1() {
-       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"
 
        clients_up
 
@@ -209,10 +208,7 @@ test_2() {
        echo "Verify Lustre filesystem is up and running"
        [ -z "$(mounted_lustre_filesystems)" ] && error "Lustre is not running"
 
-       [ "$(facet_fstype ost1)" = "zfs" ] &&
-               skip "LU-2059: no local config for ZFS OSTs" && return
-
-    clients_up
+       clients_up
 
        for i in $(seq $MDSCOUNT) ; do
                shutdown_facet mds$i
@@ -286,9 +282,6 @@ run_test 3  "Thirdb Failure Mode: MDS/CLIENT `date`"
 test_4() {
        echo "Fourth Failure Mode: OST/MDS `date`"
 
-       [ "$(facet_fstype ost1)" = "zfs" ] &&
-               skip "LU-2059: no local config for ZFS OSTs" && return
-
     #OST Portion
     shutdown_facet ost1
 
@@ -334,26 +327,25 @@ run_test 4 "Fourth Failure Mode: OST/MDS `date`"
 
 ############### Fifth Failure Mode ###############
 test_5() {
-    [ $OSTCOUNT -lt 2 ] && skip_env "$OSTCOUNT < 2, not enough OSTs" && return 0
+       [ $OSTCOUNT -lt 2 ] && skip_env "needs >= 2 OSTs"
 
-    echo "Fifth Failure Mode: OST/OST `date`"
+       echo "Fifth Failure Mode: OST/OST `date`"
 
-    #Create files
-    echo "Verify Lustre filesystem is up and running"
-    [ -z "$(mounted_lustre_filesystems)" ] && error "Lustre is not running"
+       #Create files
+       echo "Verify Lustre filesystem is up and running"
+       [ -z "$(mounted_lustre_filesystems)" ] && error "Lustre is not running"
+
+       clients_up
+       #OST Portion
+       shutdown_facet ost1
+       reboot_facet ost1
 
-    clients_up
-    
-    #OST Portion
-    shutdown_facet ost1
-    reboot_facet ost1
-    
     #Check FS
     echo "Test Lustre stability after OST failure"
     clients_up &
     DFPIDA=$!
     sleep 5
-    
+
     #OST Portion
     shutdown_facet ost2
     reboot_facet ost2
@@ -370,7 +362,7 @@ test_5() {
     start_ost 1
     wait_for_facet ost2
     start_ost 2
-    
+
     clients_recover_osts ost1
     clients_recover_osts ost2
     sleep $TIMEOUT
@@ -604,7 +596,7 @@ run_test 9 "Ninth Failure Mode: CLIENT/CLIENT `date`"
 
 ############### Tenth Failure Mode ###############
 test_10() {
-       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"
 
        shutdown_facet mds1
        reboot_facet mds1
@@ -648,7 +640,7 @@ run_test 10 "Tenth Failure Mode: MDT0/OST/MDT1 `date`"
 
 ############### Seventh Failure Mode ###############
 test_11() {
-       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"
        echo "Verify Lustre filesystem is up and running"
        [ -z "$(mounted_lustre_filesystems)" ] && error "Lustre is not running"
 
@@ -680,7 +672,7 @@ run_test 11 "Eleventh Failure Mode: MDS0/CLIENT/MDS1 `date`"
 ###################################################
 
 test_12() {
-       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"
        echo "Verify Lustre filesystem is up and running"
        [ -z "$(mounted_lustre_filesystems)" ] && error "Lustre is not running"
 
@@ -711,7 +703,7 @@ run_test 12 "Twelve Failure Mode: MDS0,MDS1/OST0, OST1/CLIENTS `date`"
 ###################################################
 
 test_13() {
-       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"
        echo "Verify Lustre filesystem is up and running"
        [ -z "$(mounted_lustre_filesystems)" ] && error "Lustre is not running"
 
@@ -742,7 +734,7 @@ run_test 13 "Thirteen Failure Mode: MDS0,MDS1/CLIENTS/OST0,OST1 `date`"
 ###################################################
 
 test_14() {
-       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"
        echo "Verify Lustre filesystem is up and running"
        [ -z "$(mounted_lustre_filesystems)" ] && error "Lustre is not running"