From 28497055cdac33293122b73e62c00555a32a5f88 Mon Sep 17 00:00:00 2001 From: Saurabh Tandan Date: Thu, 12 Nov 2015 12:41:26 -0700 Subject: [PATCH] LU-7346 tests: Reintroduce SLOW tests to review process Tests running for five minutes and more are considered to be eligible to be marked as SLOW. After running tests multiple times it was found, there are certain tests which take under five minutes and hence can be reintroduced in the normal review process. Signed-off-by: Saurabh Tandan Change-Id: If638e41a8bf6c9418d69257b00cad964d0810a02 Reviewed-on: http://review.whamcloud.com/17143 Tested-by: Jenkins Reviewed-by: James Nunez Tested-by: Maloo Reviewed-by: Wei Liu Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 5 +++-- lustre/tests/ost-pools.sh | 3 ++- lustre/tests/recovery-small.sh | 4 ++-- lustre/tests/replay-dual.sh | 1 + lustre/tests/replay-ost-single.sh | 4 +++- lustre/tests/replay-single.sh | 4 ++-- lustre/tests/replay-vbr.sh | 1 + lustre/tests/sanity-quota.sh | 5 +++-- lustre/tests/sanity.sh | 4 +++- lustre/tests/sanityn.sh | 2 +- 10 files changed, 21 insertions(+), 12 deletions(-) mode change 100644 => 100755 lustre/tests/ost-pools.sh mode change 100644 => 100755 lustre/tests/replay-vbr.sh mode change 100644 => 100755 lustre/tests/sanity-quota.sh mode change 100644 => 100755 lustre/tests/sanityn.sh diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index accbf27..3b40601 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -86,8 +86,9 @@ init_logging # require_dsh_mds || exit 0 require_dsh_ost || exit 0 -# -[ "$SLOW" = "no" ] && EXCEPT_SLOW="30a 31 45 69" + +# 8 22 (min)" +[ "$SLOW" = "no" ] && EXCEPT_SLOW="45 69" assert_DIR diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh old mode 100644 new mode 100755 index 5c130ef..6775f375 --- a/lustre/tests/ost-pools.sh +++ b/lustre/tests/ost-pools.sh @@ -29,7 +29,8 @@ init_logging check_and_setup_lustre -[ "$SLOW" = "no" ] && EXCEPT_SLOW="5b 18 22 23b 25" +# 9 12.5 (min)" +[ "$SLOW" = "no" ] && EXCEPT_SLOW="18 23b" DIR=${DIR:-$MOUNT} assert_DIR diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index 03ce07c..4c81abc 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -16,8 +16,8 @@ init_logging require_dsh_mds || exit 0 # also long tests: 19, 21a, 21e, 21f, 23, 27 -# 1 2.5 2.5 4 4 (min)" -[ "$SLOW" = "no" ] && EXCEPT_SLOW="17 26a 26b 50 51 57" + +[ "$SLOW" = "no" ] && EXCEPT_SLOW="" [ $(facet_fstype $SINGLEMDS) = "zfs" ] && # bug number for skipped test: LU-2547 diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh index dbba0a2..6500ea9 100755 --- a/lustre/tests/replay-dual.sh +++ b/lustre/tests/replay-dual.sh @@ -20,6 +20,7 @@ init_logging remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0 +# 7 (min)" [ "$SLOW" = "no" ] && EXCEPT_SLOW="21b" [[ $(facet_fstype $SINGLEMDS) == zfs ]] && diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh index 26da7d6..476b91d 100755 --- a/lustre/tests/replay-ost-single.sh +++ b/lustre/tests/replay-ost-single.sh @@ -22,13 +22,15 @@ ALWAYS_EXCEPT="$REPLAY_OST_SINGLE_EXCEPT" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! # bug number for SLOW test: +# 40 (min)" [ "$SLOW" = "no" ] && EXCEPT_SLOW="5" if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then # bug number for skipped test: LU-2285 ALWAYS_EXCEPT="$ALWAYS_EXCEPT 3" # bug number for slowed tests: LU-2887 - [ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 8a 8b" + # 32 12.5 (min)" + [ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 8a 8b" fi build_test_filter diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index cd7ecb7..f74f3a3 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -32,8 +32,8 @@ case "$(lsb_release -sr)" in # only disable tests for el7 ;; esac -# 63 min 7 min AT AT AT AT" -[ "$SLOW" = "no" ] && EXCEPT_SLOW="1 2 3 4 6 12 16 44a 44b 65 66 67 68" +# 7.5 (min)" +[ "$SLOW" = "no" ] && EXCEPT_SLOW="44b" [ $(facet_fstype $SINGLEMDS) = "zfs" ] && # bug number for skipped test: LU-1867 LU-3127 diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh old mode 100644 new mode 100755 index a6301a3..c475a8c --- a/lustre/tests/replay-vbr.sh +++ b/lustre/tests/replay-vbr.sh @@ -26,6 +26,7 @@ init_logging remote_mds_nodsh && log "SKIP: remote MDS with nodsh" && exit 0 +# ~6 (min)" [ "$SLOW" = "no" ] && EXCEPT_SLOW="7" build_test_filter diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh old mode 100644 new mode 100755 index 5b175f2..76305d7 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -51,10 +51,11 @@ if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then # bug number for skipped test: LU-5638 ALWAYS_EXCEPT="$ALWAYS_EXCEPT 11 33 34 35" # bug number: LU-2887 - ZFS_SLOW="12a" + # 21 9 (min)" + ZFS_SLOW="12a 9" fi -[ "$SLOW" = "no" ] && EXCEPT_SLOW="$ZFS_SLOW 9 18 21" +[ "$SLOW" = "no" ] && EXCEPT_SLOW="$ZFS_SLOW" QUOTALOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log} diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index e4fd17e..47a58fe 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -75,11 +75,13 @@ init_test_env $@ . ${CONFIG:=$LUSTRE/tests/cfg/${NAME}.sh} init_logging -[ "$SLOW" = "no" ] && EXCEPT_SLOW="24o 24D 27m 64b 68 71 77f 78 115 124b 300o" +# 5 12 (min)" +[ "$SLOW" = "no" ] && EXCEPT_SLOW="24D 27m 64b 68 71 115 300o" if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then # bug number for skipped test: LU-4536 LU-1957 LU-2805 ALWAYS_EXCEPT="$ALWAYS_EXCEPT 65ic 180 184c" + # 4 13 (min)" [ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 51b 51ba" fi diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh old mode 100644 new mode 100755 index 096bebc..e96bce8 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -38,7 +38,7 @@ if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then # LU-2829 / LU-2887 - make allowances for ZFS slowness TEST33_NFILES=${TEST33_NFILES:-1000} fi - +# 23 (min)" [ "$SLOW" = "no" ] && EXCEPT_SLOW="33a" FAIL_ON_ERROR=false -- 1.8.3.1