X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun_IOR.sh;h=4e44df4e87e77d14b9ec3597dc6163ffaab2bcea;hb=a665f0742a8ace6d23fd52f3b805bd8ebd8fc3ee;hp=4cd69338bf11a9d6e04b284cc6696a354d4169e8;hpb=285389479125decaefa3d64a8460a7bfe0a7c889;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run_IOR.sh b/lustre/tests/run_IOR.sh
index 4cd6933..4e44df4 100755
--- a/lustre/tests/run_IOR.sh
+++ b/lustre/tests/run_IOR.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
-set -x
 
 TMP=${TMP:-/tmp}
 
 TESTLOG_PREFIX=${TESTLOG_PREFIX:-$TMP/recovery-mds-scale}
+TESTNAME=${TESTNAME:-""}
+[ -n "$TESTNAME" ] && TESTLOG_PREFIX=$TESTLOG_PREFIX.$TESTNAME
+
 LOG=$TESTLOG_PREFIX.$(basename $0 .sh)_stdout.$(hostname -s).log
 DEBUGLOG=$(echo $LOG | sed 's/\(.*\)stdout/\1debug/')
 
@@ -11,6 +13,7 @@ mkdir -p ${LOG%/*}
 
 rm -f $LOG $DEBUGLOG
 exec 2>$DEBUGLOG
+set -x
 
 . $(dirname $0)/functions.sh
 
@@ -36,30 +39,33 @@ TESTDIR=${TESTDIR:-$MOUNT/d0.ior-$(hostname)}
 
 CONTINUE=true
 while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
-    echoerr "$(date +'%F %H:%M:%S'): IOR run starting"
-    mkdir -p $TESTDIR
-    # need this only if TESTDIR is not default
-    chmod -R 777 $TESTDIR
-
-    mpi_run -np $((NUM_CLIENTS * THREADS_PER_CLIENT)) -machinefile ${MACHINEFILE} \
-        $IOR -a POSIX -b 1g -o $TESTDIR/IOR-file -s 1 -t 1m -v -w -r 1>$LOG &
-    load_pid=$!
-    wait $load_pid
-    if [ ${PIPESTATUS[0]} -eq 0 ]; then
-	echoerr "$(date +'%F %H:%M:%S'): IOR succeeded"
-	cd $TMP
-	rm -rf $TESTDIR
-	echoerr "$(date +'%F %H:%M:%S'): IOR run finished"
-    else
-	echoerr "$(date +'%F %H:%M:%S'): IOR failed"
-	if [ -z "$ERRORS_OK" ]; then
-	    echo $(hostname) >> $END_RUN_FILE
-	fi
-	if [ $BREAK_ON_ERROR ]; then
-	    # break
-            CONTINUE=false
+	echoerr "$(date +'%F %H:%M:%S'): IOR run starting"
+	mkdir -p $TESTDIR
+	# need this only if TESTDIR is not default
+	chmod -R 777 $TESTDIR
+
+	sync
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} \
+		-np $((NUM_CLIENTS * THREADS_PER_CLIENT)) $IOR -a POSIX -b 1g \
+		-o $TESTDIR/IOR-file -s 1 -t 1m -v -w -r 1>$LOG &
+
+	load_pid=$!
+	wait $load_pid
+	if [ ${PIPESTATUS[0]} -eq 0 ]; then
+        	echoerr "$(date +'%F %H:%M:%S'): IOR succeeded"
+        	cd $TMP
+        	rm -rf $TESTDIR
+		echoerr "$(date +'%F %H:%M:%S'): IOR run finished"
+	else
+		echoerr "$(date +'%F %H:%M:%S'): IOR failed"
+		if [ -z "$ERRORS_OK" ]; then
+			echo $(hostname) >> $END_RUN_FILE
+		fi
+		if [ $BREAK_ON_ERROR ]; then
+			# break
+			CONTINUE=false
+		fi
 	fi
-    fi
 done
 
 echoerr "$(date +'%F %H:%M:%S'): IOR run exiting"