LU-11607 tests: replace lustre_version/fstype - large-lun

[fs/lustre-release.git] / lustre / tests / large-lun.sh

diff --git a/lustre/tests/large-lun.sh b/lustre/tests/large-lun.sh
index bac2b01..5f3f80b 100644 (file)
--- a/lustre/tests/large-lun.sh
+++ b/lustre/tests/large-lun.sh
@@ -11,6 +11,11 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+if [ "$REFORMAT" != "yes" ]; then
+       skip_env "$0 reformats all devices,\
+               please set REFORMAT to run this test"
+fi
+
 # Variable to run mdsrate
 THREADS_PER_CLIENT=${THREADS_PER_CLIENT:-5}    # thread(s) per client node
 MACHINEFILE=${MACHINEFILE:-$TMP/$TESTSUITE.machines}
@@ -77,7 +82,7 @@ client_df() {
 cleanup_dirs() {
        local target=$1
        local mnt=${2:-$MOUNT}
-       local cmd="rm -rf $mnt/{*.filecount,dir*}"
+       local cmd="rm -rf $mnt/{llverfs,dir}*"
        do_facet $target "$cmd"
 }
 
@@ -143,15 +148,18 @@ do_fsck() {
 trap cleanupall EXIT
 
 test_1 () {
-       [ $(facet_fstype $SINGLEMDS) != ldiskfs ] &&
-               skip "Only applicable to ldiskfs-based nodes" && return
+       [ "$mds1_FSTYPE" != ldiskfs ] && skip_env "ldiskfs only test"
+
        local dev
+
        for num in $(seq $OSTCOUNT); do
                dev=$(ostdevname $num)
                log "run llverdev on the OST $dev"
                do_rpc_nodes $(facet_host ost${num}) run_llverdev $dev -vpf ||
                        error "llverdev on $dev failed!"
        done
+       # restore format overwritten by llverdev
+       formatall
 }
 run_test 1 "run llverdev on raw LUN"
 
@@ -225,14 +233,17 @@ test_2 () {
                        $RUN_FSCK && check_fsfacet ost${num}
                fi
        done
+       # there is no reason to continue using ost devices
+       # filled by llverfs as ldiskfs
+       formatall
 }
 run_test 2 "run llverfs on OST ldiskfs/zfs filesystem"
 
 test_3 () {
-       [ -z "$CLIENTS" ] && skip_env "CLIENTS not defined, skipping" && return
-       [ -z "$MPIRUN" ] && skip_env "MIPRUN not defined, skipping" && return
-       [ -z "$MDSRATE" ] && skip_env "MDSRATE not defined, skipping" && return
-       [ ! -x $MDSRATE ] && skip_env "$MDSRATE not built, skipping" && return
+       [ -z "$CLIENTS" ] && skip_env "CLIENTS not defined, skipping"
+       [ -z "$MPIRUN" ] && skip_env "MIPRUN not defined, skipping"
+       [ -z "$MDSRATE" ] && skip_env "MDSRATE not defined, skipping"
+       [ ! -x $MDSRATE ] && skip_env "$MDSRATE not built, skipping"
        # Setup the Lustre filesystem.
        log "setup the lustre filesystem"
        REFORMAT="yes" check_and_setup_lustre