X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun_iozone.sh;h=642303cb4b43343d5069c551d5ab4dce0b6afe98;hb=39871df164bcd09a2e0d8b60c74dd2bb0c1151be;hp=297142d1fbdf3c539c7ebf64c508337db88a1653;hpb=abf2237387d0d94ed623c64e1a44962242203aea;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run_iozone.sh b/lustre/tests/run_iozone.sh
index 297142d..642303c 100755
--- a/lustre/tests/run_iozone.sh
+++ b/lustre/tests/run_iozone.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
 
@@ -32,24 +35,24 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
     load_pid=$!
     wait $load_pid
     if [ ${PIPESTATUS[0]} -eq 0 ]; then
-	echoerr "$(date +'%F %H:%M:%S'): iozone succeeded"
-	cd $TMP
-	rm -rf $TESTDIR
+        echoerr "$(date +'%F %H:%M:%S'): iozone succeeded"
+        cd $TMP
+        rm -rf $TESTDIR
         if [ -d $TESTDIR ]; then
-	    echoerr "$(date +'%F %H:%M:%S'): failed to remove $TESTDIR"
-	    echo $(hostname) >> $END_RUN_FILE
+            echoerr "$(date +'%F %H:%M:%S'): failed to remove $TESTDIR"
+            echo $(hostname) >> $END_RUN_FILE
             CONTINUE=false
         fi
-	echoerr "$(date +'%F %H:%M:%S'): iozone run finished"
+        echoerr "$(date +'%F %H:%M:%S'): iozone run finished"
     else
-	echoerr "$(date +'%F %H:%M:%S'): iozone failed"
-	if [ -z "$ERRORS_OK" ]; then
-	    echo $(hostname) >> $END_RUN_FILE
-	fi
-	if [ $BREAK_ON_ERROR ]; then
-	    # break
+        echoerr "$(date +'%F %H:%M:%S'): iozone failed"
+        if [ -z "$ERRORS_OK" ]; then
+            echo $(hostname) >> $END_RUN_FILE
+        fi
+        if [ $BREAK_ON_ERROR ]; then
+            # break
             CONTINUE=false
-	fi
+        fi
     fi
 done