LU-8995 tests: set debug size correctly

[fs/lustre-release.git] / lustre / tests / run_dbench.sh

diff --git a/lustre/tests/run_dbench.sh b/lustre/tests/run_dbench.sh
index f82d9dd..1872967 100755 (executable)
--- a/lustre/tests/run_dbench.sh
+++ b/lustre/tests/run_dbench.sh
@@ -1,65 +1,59 @@
 #!/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
 
 while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
-    echoerr "$(date +'%F %H:%M:%S'): dbench run starting"
-
-    mkdir -p $TESTDIR
-    rundbench -D $TESTDIR 2 1>$LOG &
-    load_pid=$!
-
-    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"
-    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
-            CONTINUE=false
+       echoerr "$(date +'%F %H:%M:%S'): dbench run starting"
+
+       mkdir -p $TESTDIR
+
+       sync
+       rundbench -D $TESTDIR 2 1>$LOG &
+       load_pid=$!
+
+       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"
+       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
+                       CONTINUE=false
+               fi
        fi
-    fi
 done
 
 echoerr "$(date +'%F %H:%M:%S'): dbench run exiting"