From 16e92e2d01a71c2a97cae89c70c58abf409c12c0 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 4 Sep 2018 07:08:08 +0800 Subject: [PATCH] LU-10740 tests: disable tests for replay-dne-zfs-part-4 Disable a few tests, by adding them to the ALWAYS_EXCEPT list, that are constantly failing for replay-single so that review-dne-zfs-part-4 might normally pass. A potential fix for replay-ost-single test_6 and test_7 to calculate the log size for DNE+ZFS systems more accurately for multiple MDTs. Test-Parameters: trivial testgroup=review-dne-zfs-part-4 Test-Parameters: trivial testgroup=review-dne-zfs-part-3 Test-Parameters: testlist=sanity-sec Signed-off-by: Andreas Dilger Signed-off-by: James Nunez Change-Id: I2316baeacbb18686d2958265f7128e95033ebbe5 Reviewed-on: https://review.whamcloud.com/33106 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lustre/tests/replay-ost-single.sh | 12 ++++++++---- lustre/tests/replay-single.sh | 13 ++++++++++--- lustre/tests/sanity-dom.sh | 10 ++++++++++ lustre/tests/test-framework.sh | 2 +- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh index 6561a5d..c35afd6 100755 --- a/lustre/tests/replay-ost-single.sh +++ b/lustre/tests/replay-ost-single.sh @@ -22,13 +22,17 @@ ALWAYS_EXCEPT="$REPLAY_OST_SINGLE_EXCEPT" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! # bug number for SLOW test: -# 40 (min)" +# time in minutes: 40" [ "$SLOW" = "no" ] && EXCEPT_SLOW="5" if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then -# bug number for slowed tests: LU-2887 - # 32 12.5 (min)" - [ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 8a 8b" +# bug number for slow tests: LU-2887 +# time in minutes: 32 12.5" + [ "$SLOW" = "no" ] && EXCEPT_SLOW+=" 8a 8b" + if [ $MDSCOUNT -gt 1 ]; then +# bug number for skipped test: + ALWAYS_EXCEPT+="" + fi fi build_test_filter diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index db720fc..b2a8e2d 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -25,12 +25,17 @@ require_dsh_mds || exit 0 ALWAYS_EXCEPT="$REPLAY_SINGLE_EXCEPT " # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! -# 7.5 (min)" +# time in minutes: 7.5" [ "$SLOW" = "no" ] && EXCEPT_SLOW="44b" -[ $(facet_fstype $SINGLEMDS) = "zfs" ] && +if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then # bug number for skipped test: - ALWAYS_EXCEPT="$ALWAYS_EXCEPT " + ALWAYS_EXCEPT+="" + if [ $MDSCOUNT -gt 1 ]; then +# bug number for skipped test: LU-10740 LU-11330 LU-9157 LU-11336 + ALWAYS_EXCEPT+=" 2d 70d 80c 80d" + fi +fi build_test_filter @@ -2243,6 +2248,7 @@ test_70d () { } rm -rf $DIR/$tdir/test || { echo "rmdir fails" + ls -lR $DIR/$tdir break } @@ -2257,6 +2263,7 @@ test_70d () { rm -rf $DIR/$tdir/test1 || { echo "rmdir fails" + ls -lR $DIR/$tdir/test1 break } done diff --git a/lustre/tests/sanity-dom.sh b/lustre/tests/sanity-dom.sh index 3126b00..288ea57 100644 --- a/lustre/tests/sanity-dom.sh +++ b/lustre/tests/sanity-dom.sh @@ -7,10 +7,20 @@ set -e ONLY=${ONLY:-"$*"} +# bug number for skipped test: ALWAYS_EXCEPT="$SANITY_DOM_EXCEPT" [ "$SLOW" = "no" ] && EXCEPT_SLOW="" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! +if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then +# bug number for skipped test: + ALWAYS_EXCEPT+="" + if [ $MDSCOUNT -gt 1 ]; then +# bug number for skipped test: + ALWAYS_EXCEPT+="" + fi +fi + LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)} . $LUSTRE/tests/test-framework.sh diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index c7cd6d2..afd64d2 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -785,7 +785,7 @@ fs_log_size() { ;; esac - echo -n $size + echo -n $((size * MDSCOUNT)) } fs_inode_ksize() { -- 1.8.3.1