LU-1031: add grouplock test to sanity.sh

[fs/lustre-release.git] / lustre / tests / replay-single.sh

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index cac6ea4..a062321 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -7,6 +7,7 @@ set -e
 # This test needs to be run on the client
 #
 SAVE_PWD=$PWD
+export MULTIOP=${MULTIOP:-multiop}
 LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
 SETUP=${SETUP:-}
 CLEANUP=${CLEANUP:-}
@@ -36,7 +37,7 @@ assert_DIR
 rm -rf $DIR/[df][0-9]*
 
 # LU-482 Avert LVM and VM inability to flush caches in pre .33 kernels
-if [ $LINUX_VERSION_CODE -lt $(kernel_version 2 6 33) ]; then
+if [ $LINUX_VERSION_CODE -lt $(version_code 2.6.33) ]; then
     sync
     do_facet $SINGLEMDS sync
 fi
@@ -1854,7 +1855,7 @@ test_70b () {
        local clients=${CLIENTS:-$HOSTNAME}
 
        zconf_mount_clients $clients $MOUNT
-       
+
        local duration=300
        [ "$SLOW" = "no" ] && duration=60
        # set duration to 900 because it takes some time to boot node
@@ -1863,20 +1864,20 @@ test_70b () {
        local cmd="rundbench 1 -t $duration"
        local pid=""
        do_nodesv $clients "set -x; MISSING_DBENCH_OK=$MISSING_DBENCH_OK \
-               PATH=:$PATH:$LUSTRE/utils:$LUSTRE/tests/:$DBENCH_LIB \
+               PATH=\$PATH:$LUSTRE/utils:$LUSTRE/tests/:$DBENCH_LIB \
                DBENCH_LIB=$DBENCH_LIB TESTSUITE=$TESTSUITE TESTNAME=$TESTNAME \
-               LCTL=$LCTL $cmd" &
+               MOUNT=$MOUNT DIR=$DIR/$tdir/\\\$(hostname) LCTL=$LCTL $cmd" &
        pid=$!
        log "Started rundbench load pid=$pid ..."
 
        # give rundbench a chance to start, bug 24118
-       sleep 2
+       sleep 12
        local elapsed=0
        local num_failovers=0
        local start_ts=$(date +%s)
        while [ $elapsed -lt $duration ]; do
-               if ! check_for_process $clients rundbench; then
-                       error_noexit "rundbench not found on some of $clients!"
+               if ! check_for_process $clients dbench; then
+                       error_noexit "dbench not found on some of $clients!"
                        killall_process $clients dbench
                        break
                fi