From 5519af21920165607e2bfec95c2348ac47d18bd1 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Wed, 28 Nov 2007 22:09:01 +0000
Subject: [PATCH] b=13932 i=Adilger
acc-sm "SLOW" list (all scripts)
---
lustre/tests/acceptance-small.sh | 19 ++++++++++++++-----
lustre/tests/conf-sanity.sh | 3 +++
lustre/tests/insanity.sh | 3 +++
lustre/tests/recovery-small.sh | 4 ++++
lustre/tests/replay-dual.sh | 3 +++
lustre/tests/replay-ost-single.sh | 3 +++
lustre/tests/replay-single.sh | 5 ++++-
lustre/tests/sanity.sh | 13 ++++++++-----
lustre/tests/sanityN.sh | 2 +-
9 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 14f9ac5c4b..03b742bfe2 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -27,6 +27,11 @@ fi
export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL INSANITY SANITY_QUOTA"
+if [ "$SLOW" = "no" ]; then
+# 5 min
+ export IOZONE="no"
+fi
+
if [ "$ACC_SM_ONLY" ]; then
for O in $TESTSUITE_LIST; do
export ${O}="no"
@@ -94,13 +99,17 @@ for NAME in $CONFIGS; do
[ $THREADS -lt $DB_THREADS ] && DB_THREADS=$THREADS
$DEBUG_OFF
- bash rundbench 1
- $DEBUG_ON
- $CLEANUP
- $SETUP
+ duration=""
+ [ "$SLOW" = "no" ] && duration=" -t 120"
+ if [ "$SLOW" != "no" -o $DB_THREADS -eq 1 ]; then
+ bash rundbench 1 $duration
+ $DEBUG_ON
+ $CLEANUP
+ $SETUP
+ fi
if [ $DB_THREADS -gt 1 ]; then
$DEBUG_OFF
- bash rundbench $DB_THREADS
+ bash rundbench $DB_THREADS $duration
$DEBUG_ON
$CLEANUP
$SETUP
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 5da69d60fe..c86e7862bb 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -19,6 +19,9 @@ MOUNTCONFSKIP="10 11 12 13 13b 14 15 "
ALWAYS_EXCEPT=" $CONF_SANITY_EXCEPT $MOUNTCONFSKIP 34a 36"
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
+#
+[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 0 1 2 3 6 7 15 18 24b 25 30 31 32 33 34a "
+
SRCDIR=`dirname $0`
PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH
diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh
index 54707382b9..1952c61491 100755
--- a/lustre/tests/insanity.sh
+++ b/lustre/tests/insanity.sh
@@ -12,6 +12,9 @@ init_test_env $@
ALWAYS_EXCEPT="10 $INSANITY_EXCEPT"
+#
+[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT "
+
SETUP=${SETUP:-""}
CLEANUP=${CLEANUP:-""}
diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index c80ba84775..99825f3891 100755
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -5,6 +5,10 @@ set -e
# bug 5493
ALWAYS_EXCEPT="52 $RECOVERY_SMALL_EXCEPT"
+# also long tests: 19, 21a, 21e, 21f, 23, 27
+# 1 2.5 4 4 (min)"
+[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 17 26b 50 51 57"
+
#PTLDEBUG=${PTLDEBUG:--1}
LUSTRE=${LUSTRE:-`dirname $0`/..}
. $LUSTRE/tests/test-framework.sh
diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 8e1bf12a02..62cd22d741 100755
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -5,6 +5,9 @@ set -e
# bug number: 10124
ALWAYS_EXCEPT="15c $REPLAY_DUAL_EXCEPT"
+#
+[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 1 2 3 4 5 14"
+
SAVE_PWD=$PWD
PTLDEBUG=${PTLDEBUG:--1}
LUSTRE=${LUSTRE:-`dirname $0`/..}
diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index b7052675d3..7e03456c3e 100755
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -21,6 +21,9 @@ CPU=`awk '/model/ {print $4}' /proc/cpuinfo`
# BUG NUMBER:
ALWAYS_EXCEPT="$REPLAY_OST_SINGLE_EXCEPT"
+#
+[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT "
+
# It is replay-ost-single, after all
OSTCOUNT=1
diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 9019697ee9..106910a518 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -20,6 +20,9 @@ GRANT_CHECK_LIST=${GRANT_CHECK_LIST:-""}
# bug number:
ALWAYS_EXCEPT="$REPLAY_SINGLE_EXCEPT"
+# 63 min 7 min AT AT AT AT"
+[ "SLOW" = "no" ] && EXCEPT="$EXCEPT 1 2 3 4 6 6b 12 16 44 44b 65 66 67 68"
+
build_test_filter
cleanup_and_setup_lustre
@@ -1332,7 +1335,7 @@ test_58() {
replay_barrier mds
fail mds
sleep 2
- $CHECKSTAT -t file $DIR/$tdir/$tfile-* || return 1
+ $CHECKSTAT -t file $DIR/$tdir/$tfile-* >/dev/null || return 1
do_facet mds "sysctl -w lustre.fail_loc=0x0"
unlinkmany $DIR/$tdir/$tfile-%d 2500
rmdir $DIR/$tdir
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 5ba3f4e07e..fc2178fb9a 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -11,7 +11,7 @@ ONLY=${ONLY:-"$*"}
ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27o 27q 42a 42b 42c 42d 45 51d 74b 75 $SANITY_EXCEPT" }
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
-[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 24o 27m 36f 36g 51b 51c 60c 63 64b 68 71 73 101 103 115 120g"
+[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 24o 27m 36f 36g 51b 51c 60c 63 64b 68 71 73 78 101 103 115 120g"
# Tests that fail on uml, maybe elsewhere, FIXME
CPU=`awk '/model/ {print $4}' /proc/cpuinfo`
@@ -4606,11 +4606,11 @@ test_123() # statahead(bug 11401)
mkdir -p $DIR/$tdir
- for ((i=1, j=0; i<=10000; j=$i, i=$((i * 10)) )); do
+ for ((i=1, j=0; i<=100000; j=$i, i=$((i * 10)) )); do
createmany -o $DIR/$tdir/$tfile $j $((i - j))
grep '[0-9]' $LPROC/llite/*/statahead_max
- cancel_lru_locks mdc
+ cancel_lru_locks osc
stime=`date +%s`
ls -l $DIR/$tdir > /dev/null
etime=`date +%s`
@@ -4624,7 +4624,7 @@ test_123() # statahead(bug 11401)
done
grep '[0-9]' $LPROC/llite/*/statahead_max
- cancel_lru_locks mdc
+ cancel_lru_locks osc
stime=`date +%s`
ls -l $DIR/$tdir > /dev/null
etime=`date +%s`
@@ -4639,6 +4639,9 @@ test_123() # statahead(bug 11401)
if [ $delta_sa -gt $delta ]; then
log "ls $i files is slower with statahead!"
fi
+
+ [ $delta -gt 20 ] && break
+ [ "$SLOW" = "no" -a $delta -gt 3 ] && break
done
log "ls done"
@@ -4730,7 +4733,7 @@ test_124b() {
MOUNTOPT="$MOUNTOPT,nolruresize"
setup || error "setup failed"
- NR=3000
+ NR=2000
mkdir -p $DIR/$tdir || error "failed to create $DIR/$tdir"
createmany -o $DIR/$tdir/f $NR
diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 896d9777ef..7aba5cdae2 100644
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -7,7 +7,7 @@ ONLY=${ONLY:-"$*"}
ALWAYS_EXCEPT=" 14b 14c $SANITYN_EXCEPT"
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
-[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 16"
+[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 12 16"
# Tests that fail on uml
[ "$UML" = "true" ] && EXCEPT="$EXCEPT 7"
--
GitLab