LU-577 tests: FAIL replay-single test_70b rundbench load

Test 70b for replay-single assumes that lustre is mounted on
/mnt/lustre which is not the case for us. This patch passes
the proper MOUNT. The test also was not using the standard
DIR/tdir setup which had generated data files not being
cleaned up. Increased the sleep period to match dbench's
warm up period. This gives dbench a change to start up when
using many clients.

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Yu Jian <yujian@whamcloud.com>
Change-Id: I3a793db35aa21d57220d0de1a9e92486e65ae21a
Reviewed-on: http://review.whamcloud.com/2518
Tested-by: Hudson
Reviewed-by: Wei Liu <sarah@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Johann Lombardi <johann@whamcloud.com>

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 93a79dc..6b1677d 100644 (file)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -1817,7 +1817,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
@@ -1826,20 +1826,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

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 25f1ee4..4430b86 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1652,6 +1652,7 @@ do_nodes() {
     [ -z "$myPDSH" -o "$myPDSH" = "no_dsh" -o "$myPDSH" = "rsh" ] && \
         echo "cannot run remote command on $rnodes with $myPDSH" && return 128
 
+    export FANOUT=$(get_node_count "${rnodes//,/ }")
     if $VERBOSE; then
         echo "CMD: $rnodes $@" >&2
         $myPDSH $rnodes "$LCTL mark \"$@\"" > /dev/null 2>&1 || :