X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun_iozone.sh;h=6bd7dd43067d0422d54710f071ee47a1c9cdec86;hb=b24ba6c6ea1b3cc514241b01968bf31bc8f9cf46;hp=2b71118afee37e19153501cffb355eece36526b9;hpb=f6796fea971503083308076ce78acfc385271ae4;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run_iozone.sh b/lustre/tests/run_iozone.sh
index 2b71118..6bd7dd4 100755
--- a/lustre/tests/run_iozone.sh
+++ b/lustre/tests/run_iozone.sh
@@ -1,77 +1,63 @@
 #!/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
 
-if [ -z "$MOUNT" -o -z "$END_RUN_FILE" -o -z "$LOAD_PID_FILE" ]; then
-    echo "The following must be set: MOUNT END_RUN_FILE LOAD_PID_FILE"
-    exit 1
-fi
-
-echoerr () { echo "$@" 1>&2 ; }
+. $(dirname $0)/functions.sh
 
-signaled() {
-    echoerr "$(date +'%F %H:%M:%S'): client load was signaled to terminate"
-    kill -TERM -$PPID
-    sleep 5
-    kill -KILL -$PPID
-}
+assert_env MOUNT END_RUN_FILE LOAD_PID_FILE
 
 trap signaled TERM
 
-# recovery-mds-scale uses this to signal the client loads to die
+# recovery-*-scale scripts use this to signal the client loads to die
 echo $$ >$LOAD_PID_FILE
 
-TESTDIR=$MOUNT/iozone-$(hostname)
-
-# needed to debug oom problem
-#echo 1 > /proc/sys/vm/vm_gfp_debug
-#killpids=""
-#vmstat 1 1000000 >$TMP/iozone.vmstat.out &
-#killpids="$killpids $!"
-#$LUSTRE_TESTS/runvmstat > $TMP/iozone.runvmstat.out &
-#killpids="$killpids $!"
+TESTDIR=$MOUNT/d0.iozone-$(hostname)
 
 CONTINUE=true
 while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
-    echoerr "$(date +'%F %H:%M:%S'): iozone run starting"
-    mkdir -p $TESTDIR
-    cd $TESTDIR
-    iozone -a -M -R -V 0xab -g 100M -q 512k -i0 -i1 -f $TESTDIR/iozone-file 1>$LOG &
-    load_pid=$!
-    wait $load_pid
-    if [ ${PIPESTATUS[0]} -eq 0 ]; then
-	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
-            CONTINUE=false
-        fi
-	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
-            CONTINUE=false
+	echoerr "$(date +'%F %H:%M:%S'): iozone run starting"
+	mkdir -p $TESTDIR
+	cd $TESTDIR
+
+	sync
+	iozone -a -M -R -V 0xab -g 100M -q 512k -i0 -i1 \
+					-f $TESTDIR/iozone-file 1>$LOG &
+	load_pid=$!
+	wait $load_pid
+	if [ ${PIPESTATUS[0]} -eq 0 ]; then
+		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
+			CONTINUE=false
+		fi
+		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
+			CONTINUE=false
+		fi
 	fi
-    fi
 done
 
 echoerr "$(date +'%F %H:%M:%S'): iozone run exiting"
-#kill $killpids
-#sleep 5
-#kill -9 $killpids