From c34013e21ae4c14cc2eac5ef58c20fee0124e51d Mon Sep 17 00:00:00 2001 From: Di Wang Date: Wed, 3 Aug 2016 18:34:19 -0400 Subject: [PATCH] LU-6844 tests: re-enable striped dir Since this failure should be fixed by http://review.whamcloud.com/21088 Let's revert http://review.whamcloud.com/20022 to re-enable striped dir in replay-single 70b. Test-Parameters: trivial testlist=replay-single,replay-single,replay-single,replay-single,replay-single,replay-single Signed-off-by: Di Wang Change-Id: Ie7fc18d4d57a74be6925d8a635fdb09d4917a2e7 Reviewed-on: http://review.whamcloud.com/21508 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Lai Siyao Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/replay-single.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index 3f94b96..f39f8e5 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -2036,10 +2036,6 @@ check_for_process () { 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 @@ -2052,9 +2048,9 @@ test_70b () { 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 \ @@ -2091,7 +2087,7 @@ test_70b () { 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)) -- 1.8.3.1