LU-11010 tests: remove calls to return after skip()

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

diff --git a/lustre/tests/run_dbench.sh b/lustre/tests/run_dbench.sh
index d1a4a38..1872967 100755 (executable)
--- a/lustre/tests/run_dbench.sh
+++ b/lustre/tests/run_dbench.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
-set -x
 
 TMP=${TMP:-/tmp}
 
 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/')
 
@@ -11,6 +13,7 @@ mkdir -p ${LOG%/*}
 
 rm -f $LOG $DEBUGLOG
 exec 2>$DEBUGLOG
+set -x
 
 . $(dirname $0)/functions.sh
 
@@ -26,28 +29,31 @@ 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"