X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun_dbench.sh;h=b6c2ac13a869facb8dcecf124a3a7c47521c2df4;hb=97354fbe39ec40ef720115fe5a3687c3cda7b8ae;hp=f82d9dd611f2a478660ee33836d6c674231cb977;hpb=f6796fea971503083308076ce78acfc385271ae4;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run_dbench.sh b/lustre/tests/run_dbench.sh
index f82d9dd..b6c2ac1 100755
--- a/lustre/tests/run_dbench.sh
+++ b/lustre/tests/run_dbench.sh
@@ -1,39 +1,30 @@
 #!/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() {
-    trap 0
-    echoerr "$(date +'%F %H:%M:%S'): client load was signaled to terminate"
-    kill  $load_pid 
-    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/dbench-$(hostname)
+TESTDIR=$MOUNT/d0.dbench-$(hostname)
 
 CONTINUE=true
 
@@ -46,19 +37,19 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
 
     wait $load_pid
     if [ ${PIPESTATUS[0]} -eq 0 ]; then
-	echoerr "$(date +'%F %H:%M:%S'): dbench succeeded"
-	cd $TMP
-	rm -rf $TESTDIR
-	echoerr "$(date +'%F %H:%M:%S'): dbench run finished"
+        echoerr "$(date +'%F %H:%M:%S'): dbench succeeded"
+        cd $TMP
+        rm -rf $TESTDIR
+        echoerr "$(date +'%F %H:%M:%S'): dbench run finished"
     else
-	echoerr "$(date +'%F %H:%M:%S'): dbench failed"
-	if [ -z "$ERRORS_OK" ]; then
-	    echo $(hostname) >> $END_RUN_FILE
-	fi
-	if [ $BREAK_ON_ERROR ]; then
-	    # break
+        echoerr "$(date +'%F %H:%M:%S'): dbench failed"
+        if [ -z "$ERRORS_OK" ]; then
+            echo $(hostname) >> $END_RUN_FILE
+        fi
+        if [ $BREAK_ON_ERROR ]; then
+            # break
             CONTINUE=false
-	fi
+        fi
     fi
 done