X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun_dbench.sh;h=f1520e8582f8478fb831b5c74f8df6519b81c888;hb=2e3e6ff54c312903e69633fcd0fea90da969c3a9;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..f1520e8 100755
--- a/lustre/tests/run_dbench.sh
+++ b/lustre/tests/run_dbench.sh
@@ -12,28 +12,16 @@ mkdir -p ${LOG%/*}
 rm -f $LOG $DEBUGLOG
 exec 2>$DEBUGLOG
 
-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
+. $(dirname $0)/functions.sh
 
-echoerr () { echo "$@" 1>&2 ; }
-
-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