X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmdsrate-lookup-1dir.sh;h=221a4058289d32ee81993e48ced3ccc8c06170ba;hb=3274e573957e8b8a067ae28c3f7d7788d40f310e;hp=29ea5f39052dfa2842ec6a522a7fc733867feb6f;hpb=dee5f24114531ec34fc56ce2826ada9e5690aabc;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mdsrate-lookup-1dir.sh b/lustre/tests/mdsrate-lookup-1dir.sh
index 29ea5f3..221a405 100644
--- a/lustre/tests/mdsrate-lookup-1dir.sh
+++ b/lustre/tests/mdsrate-lookup-1dir.sh
@@ -4,18 +4,17 @@
 
 # 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.
 
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+
 assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN
 
-MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
 # Do not use name [df][0-9]* to avoid cleanup by rm, bug 18045
 BASEDIR=$MOUNT/mdsrate
 TESTDIR=$BASEDIR/lookup
@@ -33,14 +32,14 @@ rm -f $LOG
 
 [ ! -x ${MDSRATE} ] && error "${MDSRATE} not built."
 
-log "===== $0 ====== " 
+log "===== $0 ====== "
 
 check_and_setup_lustre
 
 mkdir -p $BASEDIR
 chmod 0777 $BASEDIR
-$LFS setstripe $BASEDIR -c 1
-get_stripe $BASEDIR
+mdsrate_STRIPEPARAMS=${mdsrate_STRIPEPARAMS:-${fs_STRIPEPARAMS:-"-c 1"}}
+setstripe_getstripe $BASEDIR $mdsrate_STRIPEPARAMS
 
 IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
@@ -63,11 +62,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 +82,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,14 +101,18 @@ 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
 
 complete $SECONDS