LU-2059 tests: Skip insanity/10 on ZFS

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

diff --git a/lustre/tests/mdsrate-stat-large.sh b/lustre/tests/mdsrate-stat-large.sh
index fef4381..1b779f4 100644 (file)
--- a/lustre/tests/mdsrate-stat-large.sh
+++ b/lustre/tests/mdsrate-stat-large.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # This test was used in a set of CMD3 tests (cmd3-8 test).
 
@@ -8,7 +8,7 @@
 # In a dir containing 10 million striped files, the mdsrate Test Program will
 # perform directory ordered stat's (readdir) for 10 minutes. This test will be
 # run from a single node for #1 and from all nodes for #2 aggregate test to
-# measure stat performance.  
+# measure stat performance.
 
 LUSTRE=${LUSTRE:-`dirname $0`/..}
 . $LUSTRE/tests/test-framework.sh
@@ -26,9 +26,6 @@ TESTDIR=$MOUNT/stat
 NUM_FILES=${NUM_FILES:-1000000}
 TIME_PERIOD=${TIME_PERIOD:-600}                        # seconds
 
-# --random_order (default) -OR- --readdir_order
-DIR_ORDER=${DIR_ORDER:-"--readdir_order"}
-
 LOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
 CLIENT=$SINGLECLIENT
 NODES_TO_USE=${NODES_TO_USE:-$CLIENTS}
@@ -38,7 +35,7 @@ rm -f $LOG
 
 [ ! -x ${MDSRATE} ] && error "${MDSRATE} not built."
 
-log "===== $0 ====== " 
+log "===== $0 ====== "
 
 check_and_setup_lustre
 
@@ -47,7 +44,7 @@ chmod 0777 $BASEDIR
 $LFS setstripe $BASEDIR -c -1
 get_stripe $BASEDIR
 
-IFree=$(inodes_available)
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
@@ -71,14 +68,14 @@ else
         NUM_THREADS=$NUM_CLIENTS
     fi
 
-    mpi_run -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1
-    [ ${PIPESTATUS[0]} != 0 ] && error "mdsrate file creation failed, aborting"
-
+       mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_THREADS} \
+               ${COMMAND} 2>&1
+       [ ${PIPESTATUS[0]} != 0 ] &&
+               error "mdsrate file creation failed, aborting"
 fi
 
 COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --stat --time ${TIME_PERIOD}
-        --dir ${TESTDIR} --nfiles ${NUM_FILES} --filefmt 'f%%d'
-        ${DIR_ORDER} ${SEED_OPTION}"
+        --dir ${TESTDIR} --nfiles ${NUM_FILES} --filefmt 'f%%d'"
 
 # 1
 if [ -n "$NOSINGLE" ]; then
@@ -87,7 +84,8 @@ else
     log "===== $0 ### 1 NODE STAT ###"
     echo "+" ${COMMAND}
 
-    mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
+       mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} |
+               tee ${LOG}
 
     if [ ${PIPESTATUS[0]} != 0 ]; then
         [ -f $LOG ] && sed -e "s/^/log: /" $LOG
@@ -103,7 +101,8 @@ else
     log "===== $0 ### ${NUM_CLIENTS} NODES STAT ###"
     echo "+" ${COMMAND}
 
-    mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
+       mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_CLIENTS} \
+               ${COMMAND} | tee ${LOG}
 
     if [ ${PIPESTATUS[0]} != 0 ]; then
         [ -f $LOG ] && sed -e "s/^/log: /" $LOG
@@ -111,7 +110,8 @@ else
     fi
 fi
 
-equals_msg `basename $0`: test complete, cleaning up
+
+complete $SECONDS
 mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d'
 rmdir $BASEDIR || true
 rm -f $MACHINEFILE