X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmdsrate-stat-large.sh;h=19c43756ad1f77bbdd215e1875da6016f63482a4;hb=4add39c3775a69c2b3daf212b8e3fc9976bd53e6;hp=fef4381d0537b243c2d04d0150057928bfb0b105;hpb=02b8c957baa3b8742bbcde895a22ad498c6fbe25;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mdsrate-stat-large.sh b/lustre/tests/mdsrate-stat-large.sh
index fef4381..19c4375 100644
--- a/lustre/tests/mdsrate-stat-large.sh
+++ b/lustre/tests/mdsrate-stat-large.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}
@@ -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 -np ${NUM_THREADS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
+		${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 -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${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 -np ${NUM_CLIENTS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
+		${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