X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmdsrate-lookup-1dir.sh;h=f116252a78c8b9e463e549bef80eae71bf0b03a2;hb=0136a91b6d629556ef091f5ca210c13772207df9;hp=291fd7004d19017acfe403eddeb9efa8e51535ff;hpb=02b8c957baa3b8742bbcde895a22ad498c6fbe25;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mdsrate-lookup-1dir.sh b/lustre/tests/mdsrate-lookup-1dir.sh
index 291fd70..f116252 100644
--- a/lustre/tests/mdsrate-lookup-1dir.sh
+++ b/lustre/tests/mdsrate-lookup-1dir.sh
@@ -4,7 +4,7 @@
 
 # Directory lookup retrieval rate single directory 10 million files
 # 5900 random lookups/sec per client node 62,000 random lookups/sec aggregate
-# 
+#
 # In a dir containing 10 million non-striped files the mdsrate Test Program will
 # perform lookups for 10 minutes. This test can be run from a single node for
 # #1 and from all nodes for #2 aggregate test to measure lookup performance.
@@ -33,7 +33,7 @@ rm -f $LOG
 
 [ ! -x ${MDSRATE} ] && error "${MDSRATE} not built."
 
-log "===== $0 ====== " 
+log "===== $0 ====== "
 
 check_and_setup_lustre
 
@@ -42,7 +42,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
@@ -63,11 +63,17 @@ else
     fi
     COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --mknod --dir ${TESTDIR}
                         --nfiles ${NUM_FILES} --filefmt 'f%%d'"
-    echo "+" ${COMMAND}
-    mpi_run -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1 
-
-    # No lockup if error occurs on file creation, abort.
-    [ ${PIPESTATUS[0]} != 0 ] && error "mdsrate file creation failed, aborting"
+	echo "+" ${COMMAND}
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_THREADS} \
+		${COMMAND} 2>&1
+
+	# No lockup if error occurs on file creation, abort.
+	if [ ${PIPESTATUS[0]} != 0 ]; then
+		error_noexit "mdsrate file creation failed, aborting"
+		mdsrate_cleanup $NUM_THREADS $MACHINEFILE $NUM_FILES \
+				$TESTDIR 'f%%d' --ignore
+		exit 1
+	fi
 fi
 
 COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --lookup --time ${TIME_PERIOD} ${SEED_OPTION}
@@ -77,14 +83,18 @@ COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --lookup --time ${TIME_PERIOD} ${SEED_OPTIO
 if [ -n "$NOSINGLE" ]; then
     echo "NO Test for lookups on a single client."
 else
-    log "===== $0 ### 1 NODE LOOKUPS ###"
-    echo "+" ${COMMAND}
-    mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
-
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate lookups on a single client failed, aborting"
-    fi
+	log "===== $0 ### 1 NODE LOOKUPS ###"
+	echo "+" ${COMMAND}
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} |
+		tee ${LOG}
+
+	if [ ${PIPESTATUS[0]} != 0 ]; then
+		[ -f $LOG ] && sed -e "s/^/log: /" $LOG
+		error_noexit "mdsrate lookup on single client failed, aborting"
+		mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+				$TESTDIR 'f%%d' --ignore
+		exit 1
+	fi
 fi
 
 # 2
@@ -92,17 +102,21 @@ fi
 if [ -n "$NOMULTI" ]; then
     echo "NO test for lookups on multiple nodes."
 else
-    log "===== $0 ### ${NUM_CLIENTS} NODES LOOKUPS ###"
-    echo "+" ${COMMAND}
-    mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
-
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate lookups on multiple nodes failed, aborting"
-    fi
+	log "===== $0 ### ${NUM_CLIENTS} NODES LOOKUPS ###"
+	echo "+" ${COMMAND}
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_CLIENTS} \
+		${COMMAND} | tee ${LOG}
+
+	if [ ${PIPESTATUS[0]} != 0 ]; then
+		[ -f $LOG ] && sed -e "s/^/log: /" $LOG
+		error_noexit "mdsrate lookup on multiple nodes failed, aborting"
+		mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+				$TESTDIR 'f%%d' --ignore
+		exit 1
+	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