X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun_IOR.sh;h=98379f51cc3b8a823c79729e4ae64b9207cf6a2e;hb=5c033757a9a36b83bf891715e683ed06a4bded8e;hp=6da7f54f3101940343d27f86e55ae9e877a85675;hpb=e2cd3061d9419393bc55b19df2d9d51d0cbe8932;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run_IOR.sh b/lustre/tests/run_IOR.sh
index 6da7f54..98379f5 100755
--- a/lustre/tests/run_IOR.sh
+++ b/lustre/tests/run_IOR.sh
@@ -1,16 +1,19 @@
 #!/bin/bash
-set -x
 
 TMP=${TMP:-/tmp}
 
-TESTSUITELOG=${TESTSUITELOG:-$TMP/recovery-mds-scale}
-LOG=${TESTSUITELOG}_$(basename $0)-$(hostname)
-DEBUGLOG=${LOG}.debug
+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/')
 
 mkdir -p ${LOG%/*}
 
 rm -f $LOG $DEBUGLOG
 exec 2>$DEBUGLOG
+set -x
 
 . $(dirname $0)/functions.sh
 
@@ -36,30 +39,32 @@ 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
+
+	run_ior fpp $TESTDIR  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"