From 8abf07f93019d7f3cddd9a796f9486dd56be2f13 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Wed, 18 Apr 2012 10:13:54 -0400 Subject: [PATCH] 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. Set the pdsh FANOUT environment variable because by default pdsh launches in blocks of 32 nodes. This way pdsh will lauch all node jobs at the same time Signed-off-by: James Simmons Signed-off-by: Yu Jian Change-Id: I5fd4160fc684c19990caf60b51ef62d18ff98249 Reviewed-on: http://review.whamcloud.com/2538 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Wei Liu Reviewed-by: Oleg Drokin --- lustre/tests/replay-single.sh | 12 ++++++------ lustre/tests/test-framework.sh | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index d086fc5..cb398db 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -1828,7 +1828,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 @@ -1837,20 +1837,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 e9e02e1..5a063f9 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1875,6 +1875,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 || : -- 1.8.3.1