X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ftests%2Fmdsrate-lookup-10dirs.sh;h=4e89f2234d294213e095469aee9d6935e47af909;hb=c4c17fa4a3f5d9c3df44e19ab3385c8de655cdef;hp=6dd5b1195e0aab0f9f4e65125ce830603f7cd849;hpb=de677fa6395b2646fbeb9822c59f3e4547aefba6;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mdsrate-lookup-10dirs.sh b/lustre/tests/mdsrate-lookup-10dirs.sh
index 6dd5b11..4e89f22 100644
--- a/lustre/tests/mdsrate-lookup-10dirs.sh
+++ b/lustre/tests/mdsrate-lookup-10dirs.sh
@@ -4,7 +4,7 @@
 
 # Directory lookup retrieval rate 10 directories 1 million files each
 # 6000 random lookups/sec per client node 62,000 random lookups/sec aggregate
-# 
+#
 # In 10 dirs containing 1 million files each the mdsrate Test Program will
 # perform lookups for 10 minutes. This test is run from a single node for
 # #1 and from all nodes for #2 aggregate test to measure lookup performance.
@@ -34,7 +34,7 @@ rm -f $LOG
 
 [ ! -x ${MDSRATE} ] && error "${MDSRATE} not built."
 
-log "===== $0 ====== " 
+log "===== $0 ====== "
 
 check_and_setup_lustre
 
@@ -52,13 +52,22 @@ generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate mach
 
 DIRfmt="${BASEDIR}/lookup-%d"
 
+#
+# Unlink the files created in the directories under $BASEDIR.
+# FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
+#
+mdsrate_cleanup_all() {
+	local i
+	for i in $(seq 0 $NUM_DIRS); do
+		mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+				$BASEDIR/lookup-$i 'f%%d' --ignore
+	done
+}
+
 if [ -n "$NOCREATE" ]; then
     echo "NOCREATE=$NOCREATE  => no file creation."
 else
-    # FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
-    for i in $(seq 0 $NUM_DIRS); do
-        mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $BASEDIR/lookup-$i 'f%%d' --ignore
-    done
+	mdsrate_cleanup_all
 
     log "===== $0 Test preparation: creating ${NUM_DIRS} dirs with ${NUM_FILES} files."
 
@@ -71,11 +80,15 @@ else
 	# This is just a test preparation, does not matter how many threads we
 	# use for files creation; we just should be aware that NUM_DIRS is less
 	# than or equal to the number of threads np
-	mpi_run -np ${NUM_DIRS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_DIRS} \
 		${COMMAND} 2>&1
 
-    # No lookup if error occurs on file creation, abort.
-    [ ${PIPESTATUS[0]} != 0 ] && error "mdsrate file creation failed, aborting"
+	# No lookup if error occurs on file creation, abort.
+	if [ ${PIPESTATUS[0]} != 0 ]; then
+		error_noexit "mdsrate file creation failed, aborting"
+		mdsrate_cleanup_all
+		exit 1
+	fi
 fi
 
 COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --lookup --time ${TIME_PERIOD} ${SEED_OPTION}
@@ -88,13 +101,15 @@ if [ -n "$NOSINGLE" ]; then
 else
 	log "===== $0 ### 1 NODE LOOKUPS ###"
 	echo "+" ${COMMAND}
-	mpi_run -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${COMMAND} |
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${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
+	if [ ${PIPESTATUS[0]} != 0 ]; then
+		[ -f $LOG ] && sed -e "s/^/log: /" $LOG
+		error_noexit "mdsrate lookup on single client failed, aborting"
+		mdsrate_cleanup_all
+		exit 1
+	fi
 fi
 
 # 2
@@ -104,22 +119,19 @@ if [ -n "$NOMULTI" ]; then
 else
 	log "===== $0 ### ${NUM_CLIENTS} NODES LOOKUPS ###"
 	echo "+" ${COMMAND}
-	mpi_run -np ${NUM_CLIENTS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_CLIENTS} \
 		${COMMAND} | tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate lookups on multiple nodes failed, aborting"
-    fi
+	if [ ${PIPESTATUS[0]} != 0 ]; then
+		[ -f $LOG ] && sed -e "s/^/log: /" $LOG
+		error_noexit "mdsrate lookup on multiple nodes failed, aborting"
+		mdsrate_cleanup_all
+		exit 1
+	fi
 fi
 
 complete $SECONDS
-# FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
-for i in $(seq 0 $NUM_DIRS); do
-	mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
-		$BASEDIR/lookup-$i 'f%%d' --ignore
-done
-
+mdsrate_cleanup_all
 rmdir $BASEDIR || true
 rm -f $MACHINEFILE
 check_and_cleanup_lustre