From a1adf1e962071bc2444e6622e9c3e9a300d92383 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Wed, 28 May 2008 19:37:13 +0000
Subject: [PATCH] b=14773 i=Adilger
rename subtests to skipping mechanism works properly
---
lustre/tests/conf-sanity.sh | 4 +-
lustre/tests/replay-dual.sh | 69 +----------------------------------
lustre/tests/replay-single.sh | 32 ++++++++--------
lustre/tests/sanity-quota.sh | 12 +++---
lustre/tests/sanity.sh | 12 +++---
lustre/tests/sanityN.sh | 8 ++--
6 files changed, 36 insertions(+), 101 deletions(-)
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index d165584564..86226482ea 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -504,7 +504,7 @@ test_12() {
}
run_test 12 "lmc --batch, with single/double quote, backslash in batchfile"
-test_13() {
+test_13a() { # was test_13
OLDXMLCONFIG=$XMLCONFIG
XMLCONFIG="conf13-1.xml"
@@ -537,7 +537,7 @@ test_13() {
rm -f $XMLCONFIG
XMLCONFIG=$OLDXMLCONFIG
}
-run_test 13 "check new_uuid of lmc operating correctly"
+run_test 13a "check new_uuid of lmc operating correctly"
test_13b() {
OLDXMLCONFIG=$XMLCONFIG
diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 2f1646722b..d472dc64fc 100755
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -255,7 +255,7 @@ test_14() {
}
run_test 14 "timeouts waiting for lost client during replay"
-test_15() {
+test_15a() { # was test_15
replay_barrier $SINGLEMDS
createmany -o $MOUNT1/$tfile- 25
createmany -o $MOUNT2/$tfile-2- 1
@@ -270,72 +270,7 @@ test_15() {
zconf_mount `hostname` $MOUNT2 || error "mount $MOUNT2 fail"
return 0
}
-run_test 15 "timeout waiting for lost client during replay, 1 client completes"
-
-test_15a() {
- local ost_last_id=""
- local osc_last_id=""
-
- replay_barrier $SINGLEMDS
- echo "data" > "$MOUNT2/${tfile}-m2"
-
- umount $MOUNT2
- facet_failover $SINGLEMDS
- df $MOUNT || return 1
-
- ost_last_id=`lctl get_param -n obdfilter.*.last_id`
- mds_last_id=`lctl get_param -n osc.*mds*.last_id`
-
- echo "Ids after MDS<->OST synchonizing"
- echo "--------------------------------"
- echo "MDS last_id:"
- echo $mds_last_id
- echo "OST last_id:"
- echo $ost_last_id
-
- local i=0
- echo $ost_last_id | while read id; do
- ost_ids[$i]=$id
- ((i++))
- done
-
- i=0
- echo $mds_last_id | while read id; do
- mds_ids[$i]=$id
- ((i++))
- done
-
- local arr_len=${#mds_ids[*]}
- for ((i=0;i<$arr_len;i++)); do
- mds_id=${mds_ids[i]}
- ost_id=${ost_ids[i]}
-
- test $mds_id -ge $ost_id || {
- echo "MDS last id ($mds_id) is smaller than OST one ($ost_id)"
- return 2
- }
- done
-
- zconf_mount `hostname` $MOUNT2 || error "mount $MOUNT2 fail"
- return 0
-}
-#CROW run_test 15a "OST clear orphans - synchronize ids on MDS and OST"
-
-test_15b() {
- replay_barrier $SINGLEMDS
- echo "data" > "$MOUNT2/${tfile}-m2"
- umount $MOUNT2
-
- do_facet ost1 "lctl set_param fail_loc=0x80000802"
- facet_failover $SINGLEMDS
-
- df $MOUNT || return 1
- do_facet ost1 "lctl set_param fail_loc=0"
-
- zconf_mount `hostname` $MOUNT2 || error "mount $MOUNT2 fail"
- return 0
-}
-#CROW run_test 15b "multiple delayed OST clear orphans"
+run_test 15a "timeout waiting for lost client during replay, 1 client completes"
test_15c() {
replay_barrier $SINGLEMDS
diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 25c244a8a7..7cbb1d9ba8 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -21,8 +21,8 @@ GRANT_CHECK_LIST=${GRANT_CHECK_LIST:-""}
# bug number: 2766 4176 11404
ALWAYS_EXCEPT="0b 39 56 $REPLAY_SINGLE_EXCEPT"
-# 63 min 7 min AT AT AT AT"
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="1 2 3 4 6 6b 12 16 44 44b 65 66 67 68"
+# 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"
build_test_filter
@@ -32,14 +32,14 @@ mkdir -p $DIR
rm -rf $DIR/[df][0-9]*
-test_0() {
+test_0a() { # was test_0
sleep 10
mkdir $DIR/$tfile
replay_barrier $SINGLEMDS
fail $SINGLEMDS
rmdir $DIR/$tfile
}
-run_test 0 "empty replay"
+run_test 0a "empty replay"
test_0b() {
# this test attempts to trigger a race in the precreation code,
@@ -180,7 +180,7 @@ test_3c() {
}
run_test 3c "replay failed open -ENOMEM"
-test_4() {
+test_4a() { # was test_4
replay_barrier $SINGLEMDS
for i in `seq 10`; do
echo "tag-$i" > $DIR/$tfile-$i
@@ -190,7 +190,7 @@ test_4() {
grep -q "tag-$i" $DIR/$tfile-$i || error "$tfile-$i"
done
}
-run_test 4 "|x| 10 open(O_CREAT)s"
+run_test 4a "|x| 10 open(O_CREAT)s"
test_4b() {
replay_barrier $SINGLEMDS
@@ -218,7 +218,7 @@ test_5() {
run_test 5 "|x| 220 open(O_CREAT)"
-test_6() {
+test_6a() { # was test_6
replay_barrier $SINGLEMDS
mcreate $DIR/$tdir/$tfile
fail $SINGLEMDS
@@ -227,7 +227,7 @@ test_6() {
sleep 2
# waiting for log process thread
}
-run_test 6 "mkdir + contained create"
+run_test 6a "mkdir + contained create"
test_6b() {
replay_barrier $SINGLEMDS
@@ -430,7 +430,7 @@ test_19() {
}
run_test 19 "|X| mcreate, open, write, rename "
-test_20() {
+test_20a() { # was test_20
replay_barrier $SINGLEMDS
multiop_bg_pause $DIR/$tfile O_tSc || return 3
pid=$!
@@ -442,7 +442,7 @@ test_20() {
[ -e $DIR/$tfile ] && return 2
return 0
}
-run_test 20 "|X| open(O_CREAT), unlink, replay, close (test mds_cleanup_orphans)"
+run_test 20a "|X| open(O_CREAT), unlink, replay, close (test mds_cleanup_orphans)"
test_20b() { # bug 10480
BEFOREUSED=`df -P $DIR | tail -1 | awk '{ print $3 }'`
@@ -703,7 +703,7 @@ test_32() {
run_test 32 "close() notices client eviction; close() after client eviction"
# Abort recovery before client complete
-test_33() {
+test_33a() { # was test_33
replay_barrier $SINGLEMDS
createmany -o $DIR/$tfile-%d 100
fail_abort $SINGLEMDS
@@ -712,10 +712,10 @@ test_33() {
unlinkmany $DIR/$tfile-%d 0 100
return 0
}
-run_test 33 "abort recovery before client does replay"
+run_test 33a "abort recovery before client does replay"
# Stale FID sequence
-test_33a() {
+test_33b() { # was test_33a
replay_barrier $SINGLEMDS
createmany -o $DIR/$tfile-%d 10
fail_abort $SINGLEMDS
@@ -725,7 +725,7 @@ test_33a() {
unlinkmany $DIR/$tfile-%d 0 10
return 0
}
-run_test 33a "fid shouldn't be reused after abort recovery"
+run_test 33b "fid shouldn't be reused after abort recovery"
test_34() {
multiop_bg_pause $DIR/$tfile O_c || return 2
@@ -915,7 +915,7 @@ test_43() { # bug 2530
}
run_test 43 "mds osc import failure during recovery; don't LBUG"
-test_44() {
+test_44a() { # was test_44
mdcdev=`lctl get_param -n devices | awk '/MDT0000-mdc-/ {print $1}'`
[ "$mdcdev" ] || exit 2
for i in `seq 1 10`; do
@@ -927,7 +927,7 @@ test_44() {
do_facet $SINGLEMDS "lctl set_param fail_loc=0"
return 0
}
-run_test 44 "race in target handle connect"
+run_test 44a "race in target handle connect"
test_44b() {
mdcdev=`lctl get_param -n devices | awk '/MDT0000-mdc-/ {print $1}'`
diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 7b24a8593f..22445c09e9 100644
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -405,7 +405,7 @@ test_file_soft() {
}
# file soft limit (start timer, timer goes off, stop timer)
-test_4() {
+test_4a() { # was test_4
chmod 0777 $DIR/$tdir
LIMIT=$(($IUNIT_SZ * 10)) # 10 iunits on mds
TESTFILE=$DIR/$tdir/$tfile-0
@@ -433,9 +433,9 @@ test_4() {
$LFS setquota -t -u $MAX_DQ_TIME $MAX_IQ_TIME $DIR
$LFS setquota -t -g $MAX_DQ_TIME $MAX_IQ_TIME $DIR
}
-run_test 4 "File soft limit (start timer, timer goes off, stop timer) ==="
+run_test 4a "File soft limit (start timer, timer goes off, stop timer) ==="
-test_4a() {
+test_4b() { # was test_4a
GR_STR1="1w3d"
GR_STR2="1000s"
GR_STR3="5s"
@@ -459,7 +459,7 @@ test_4a() {
$LFS setquota -t -u $MAX_DQ_TIME $MAX_IQ_TIME $DIR
$LFS setquota -t -g $MAX_DQ_TIME $MAX_IQ_TIME $DIR
}
-run_test 4a "Grace time strings handling ==="
+run_test 4b "Grace time strings handling ==="
# chown & chgrp (chown & chgrp successfully even out of block/file quota)
test_5() {
@@ -1015,7 +1015,7 @@ pre_test_14 () {
pre_test_14
-test_14(){ # b=12223 -- setting quota on root
+test_14a() { # was test_14 b=12223 -- setting quota on root
TESTFILE="$DIR/$tdir/$tfile"
# out of root's file and block quota
@@ -1042,7 +1042,7 @@ test_14(){ # b=12223 -- setting quota on root
unlinkmany ${TESTFILE} 15
rm -f $TESTFILE
}
-run_test 14 "test setting quota on root ==="
+run_test 14a "test setting quota on root ==="
# turn off quota
test_99()
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 2010e9cfda..91f35ca8c2 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2141,7 +2141,7 @@ test_50() {
}
run_test 50 "special situations: /proc symlinks ==============="
-test_51() {
+test_51a() { # was test_51
# bug 1516 - create an empty entry right after ".." then split dir
mkdir $DIR/d51
touch $DIR/d51/foo
@@ -2157,7 +2157,7 @@ test_51() {
echo
ls -l $DIR/d51 > /dev/null || error
}
-run_test 51 "special situations: split htree with empty entry =="
+run_test 51a "special situations: split htree with empty entry =="
#export NUMTEST=70000
# FIXME: I select a relatively small number to do basic test.
@@ -2363,7 +2363,7 @@ test_55() {
}
run_test 55 "check iopen_connect_dentry() ======================"
-test_56() {
+test_56a() { # was test_56
rm -rf $DIR/d56
$SETSTRIPE -d $DIR
mkdir $DIR/d56
@@ -2413,7 +2413,7 @@ test_56() {
error "lfs getstripe --obd wrong: should not show file on other obd"
echo "lfs getstripe --obd passed."
}
-run_test 56 "check lfs getstripe ===================================="
+run_test 56a "check lfs getstripe ===================================="
NUMFILES=3
NUMDIRS=3
@@ -2709,7 +2709,7 @@ test_62() {
run_test 62 "verify obd_match failure doesn't LBUG (should -EIO)"
# bug 2319 - oig_wait() interrupted causes crash because of invalid waitq.
-test_63() {
+test_63a() { # was test_63
MAX_DIRTY_MB=`lctl get_param -n osc.*.max_dirty_mb | head -n 1`
lctl set_param -n osc.*.max_dirty_mb 0
for i in `seq 10` ; do
@@ -2722,7 +2722,7 @@ test_63() {
lctl set_param -n osc.*.max_dirty_mb $MAX_DIRTY_MB
rm -f $DIR/f63 || true
}
-run_test 63 "Verify oig_wait interruption does not crash ======="
+run_test 63a "Verify oig_wait interruption does not crash ======="
# bug 2248 - async write errors didn't return to application on sync
# bug 3677 - async write errors left page locked
diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 6bbf940747..05dbf3be32 100644
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -3,8 +3,8 @@
set -e
ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 3192 9977
-ALWAYS_EXCEPT="14b 28 $SANITYN_EXCEPT"
+# bug number for skipped test: 3192 15528/3811 9977 15528/11549
+ALWAYS_EXCEPT=" 14b 19 28 29 $SANITYN_EXCEPT"
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
# bug number for skipped test: 12652 12652
@@ -377,7 +377,7 @@ test_19() { # bug3811
done
rm $DIR1/f19b
}
-#run_test 19 "test concurrent uncached read races ==============="
+run_test 19 "test concurrent uncached read races ==============="
test_20() {
mkdir $DIR1/d20
@@ -583,7 +583,7 @@ test_29() { # bug 10999
wait
}
#bug 11549 - permanently turn test off in b1_5
-#run_test 29 "lock put race between glimpse and enqueue ========="
+run_test 29 "lock put race between glimpse and enqueue ========="
test_30() { #bug #11110
cp -f /bin/bash $DIR1/$tdir/bash
--
GitLab