LU-6844 tests: disable DNE testing of dbench

Temporarily disable DNE recovery testing with dbench until LU-6844
and related failures are fixed.

Test-Parameters: testlist=replay-single,replay-single,replay-single,replay-single,replay-single,replay-single
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: I628642acb119121457ffb83d654f02e7ac40d056
Reviewed-on: http://review.whamcloud.com/20022
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index feef23b..5b00f7e 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -22,7 +22,7 @@ require_dsh_mds || exit 0
 
 # Skip these tests
 # bug number for skipped tests:
 
 # Skip these tests
 # bug number for skipped tests:

-#                                    b=17466/LU-472
+#                                    LU-472

 ALWAYS_EXCEPT="$REPLAY_SINGLE_EXCEPT 61d"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 ALWAYS_EXCEPT="$REPLAY_SINGLE_EXCEPT 61d"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 


@@ -2036,6 +2036,10 @@ check_for_process () {
 
 test_70b () {
        local clients=${CLIENTS:-$HOSTNAME}
 
 test_70b () {
        local clients=${CLIENTS:-$HOSTNAME}

+       local mdscount=$MDSCOUNT
+
+       # until LU-6844 is fixed, run on one MDT instead of disabling test
+       mdscount=1

 
        zconf_mount_clients $clients $MOUNT
 
 
        zconf_mount_clients $clients $MOUNT
 


@@ -2048,9 +2052,9 @@ test_70b () {
        local start_ts=$(date +%s)
        local cmd="rundbench 1 -t $duration"
        local pid=""
        local start_ts=$(date +%s)
        local cmd="rundbench 1 -t $duration"
        local pid=""

-       if [ $MDSCOUNT -ge 2 ]; then
-               test_mkdir -p -c$MDSCOUNT $DIR/$tdir
-               $LFS setdirstripe -D -c$MDSCOUNT $DIR/$tdir
+       if [ $mdscount -ge 2 ]; then
+               test_mkdir -p -c$mdscount $DIR/$tdir
+               $LFS setdirstripe -D -c$mdscount $DIR/$tdir

        fi
        do_nodesv $clients "set -x; MISSING_DBENCH_OK=$MISSING_DBENCH_OK \
                PATH=\$PATH:$LUSTRE/utils:$LUSTRE/tests/:$DBENCH_LIB \
        fi
        do_nodesv $clients "set -x; MISSING_DBENCH_OK=$MISSING_DBENCH_OK \
                PATH=\$PATH:$LUSTRE/utils:$LUSTRE/tests/:$DBENCH_LIB \


@@ -2087,7 +2091,7 @@ test_70b () {
                log "$TESTNAME fail mds$fail_index $num_failovers times"
                fail mds$fail_index
                elapsed=$(($(date +%s) - start_ts))
                log "$TESTNAME fail mds$fail_index $num_failovers times"
                fail mds$fail_index
                elapsed=$(($(date +%s) - start_ts))

-               if [ $fail_index -ge $MDSCOUNT ]; then
+               if [ $fail_index -ge $mdscount ]; then

                        fail_index=1
                else
                        fail_index=$((fail_index+1))
                        fail_index=1
                else
                        fail_index=$((fail_index+1))