# bug number for skipped test: 13739
HEAD_EXCEPT=" 32a 32b "
-# bug number for skipped test: 10510 12743
-ALWAYS_EXCEPT=" $CONF_SANITY_EXCEPT $MOUNTCONFSKIP $HEAD_EXCEPT 23 36"
+# bug number for skipped test: 14957 12743
+ALWAYS_EXCEPT=" $CONF_SANITY_EXCEPT $MOUNTCONFSKIP $HEAD_EXCEPT 23a 36 "
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
SRCDIR=`dirname $0`
}
run_test 22 "start a client before osts (should return errs)"
-test_23() {
+test_23a() { # was test_23
setup
# fail mds
stop mds
stop_mds
stop_ost
}
-#this test isn't working yet
-#run_test 23 "interrupt client during recovery mount delay"
+run_test 23a "interrupt client during recovery mount delay"
+
+fs2mds_HOST=$mds_HOST
+fs2ost_HOST=$ost_HOST
+
+cleanup_24a() {
+ trap 0
+ echo "umount $MOUNT2 ..."
+ umount $MOUNT2 || true
+ echo "stopping fs2mds ..."
+ stop fs2mds -f || true
+ echo "stopping fs2ost ..."
+ stop fs2ost -f || true
+}
test_24a() {
#set up fs1
gen_config
#set up fs2
- local fs2mds_HOST=$mds_HOST
- local fs2ost_HOST=$ost_HOST
[ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST
if [ -z "$fs2ost_DEV" -o -z "$fs2mds_DEV" ]; then
do_facet $SINGLEMDS [ -b "$MDSDEV" ] && \
add fs2ost $OST_MKFS_OPTS --fsname=${FSNAME2} --reformat $fs2ostdev || exit 10
setup
- start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS
+ start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS && trap cleanup_24a EXIT INT
start fs2ost $fs2ostdev $OST_MOUNT_OPTS
mkdir -p $MOUNT2
mount -t lustre $MGSNID:/${FSNAME2} $MOUNT2 || return 1
stop_mds
MDS=$(do_facet $SINGLEMDS "cat $LPROC/devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }')
[ -z "$MDS" ] && error "No MDT" && return 8
- umount $MOUNT2
- stop fs2mds -f
- stop fs2ost -f
+ cleanup_24a
cleanup_nocli || return 6
}
run_test 24a "Multiple MDTs on a single node"
test_24b() {
- local fs2mds_HOST=$mds_HOST
if [ -z "$fs2mds_DEV" ]; then
do_facet $SINGLEMDS [ -b "$MDSDEV" ] && \
skip "mixed loopback and real device not working" && return
}
run_test 32b "Upgrade from 1.4 with writeconf"
-test_33() { # bug 12333
+test_33a() { # bug 12333, was test_33
local rc=0
local FSNAME2=test-123
- local fs2mds_HOST=$mds_HOST
- local fs2ost_HOST=$ost_HOST
[ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST
if [ -z "$fs2ost_DEV" -o -z "$fs2mds_DEV" ]; then
add fs2mds $MDS_MKFS_OPTS --fsname=${FSNAME2} --reformat $fs2mdsdev || exit 10
add fs2ost $OST_MKFS_OPTS --fsname=${FSNAME2} --index=8191 --mgsnode=$MGSNID --reformat $fs2ostdev || exit 10
- start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS
+ start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS && trap cleanup_24a EXIT INT
start fs2ost $fs2ostdev $OST_MOUNT_OPTS
do_facet mds "$LCTL conf_param $FSNAME2.sys.timeout=200" || rc=1
mkdir -p $MOUNT2
cleanup_nocli || rc=6
return $rc
}
-run_test 33 "Mount ost with a large index number"
+run_test 33a "Mount ost with a large index number"
-test_34() {
+test_33b() { # was test_34
setup
do_facet client dd if=/dev/zero of=$MOUNT/24 bs=1024k count=1
umount_client $MOUNT
cleanup
}
-run_test 34 "Drop cancel during umount"
+run_test 33b "Drop cancel during umount"
test_34a() {
setup
test_36() { # 12743
local rc
local FSNAME2=test1234
- local fs2mds_HOST=$mds_HOST
- local fs2ost_HOST=$ost_HOST
local fs3ost_HOST=$ost_HOST
[ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST && fs3ost_HOST=$ost1_HOST