set -e
-# 17 = bug 2732 2986
-ALWAYS_EXCEPT="17 19b"
+# bug 2986
+ALWAYS_EXCEPT="20b"
LUSTRE=${LUSTRE:-`dirname $0`/..}
init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/local.sh}
+. ${CONFIG:=$LUSTRE/tests/cfg/lmv.sh}
build_test_filter
+assert_env MDSCOUNT
# Allow us to override the setup if we already have a mounted system by
# setting SETUP=" " and CLEANUP=" "
SETUP=${SETUP:-"setup"}
CLEANUP=${CLEANUP:-"cleanup"}
-
-make_config() {
+gen_config() {
rm -f $XMLCONFIG
- add_mds mds --dev $MDSDEV --size $MDSSIZE
- add_lov lov1 mds --stripe_sz $STRIPE_BYTES\
- --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
+
+ if [ "$MDSCOUNT" -gt 1 ]; then
+ add_lmv lmv1
+ for mds in `mds_list`; do
+ MDSDEV=$TMP/${mds}-`hostname`
+ add_mds $mds --dev $MDSDEV --size $MDSSIZE --lmv lmv1
+ done
+ add_lov_to_lmv lov1 lmv1 --stripe_sz $STRIPE_BYTES \
+ --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
+ MDS=lmv1
+ else
+ add_mds mds1 --dev $MDSDEV --size $MDSSIZE
+ add_lov lov1 mds1 --stripe_sz $STRIPE_BYTES \
+ --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
+ MDS=mds1_svc
+
+ fi
+
add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
add_ost ost2 --lov lov1 --dev ${OSTDEV}-2 --size $OSTSIZE
- add_client client mds --lov lov1 --path $MOUNT
+ add_client client --mds ${MDS} --lov lov1 --path $MOUNT
}
setup() {
- make_config
+ gen_config
start ost --reformat $OSTLCONFARGS
start ost2 --reformat $OSTLCONFARGS
[ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
- start mds $MDSLCONFARGS --reformat
- zconf_mount `hostname` $MOUNT
+ for mds in `mds_list`; do
+ start $mds --reformat $MDSLCONFARGS
+ done
+
+ grep " $MOUNT " /proc/mounts || zconf_mount `hostname` $MOUNT
}
cleanup() {
zconf_umount `hostname` $MOUNT
- stop mds ${FORCE} $MDSLCONFARGS
+ for mds in `mds_list`; do
+ stop $mds ${FORCE} $MDSLCONFARGS
+ done
stop ost2 ${FORCE} --dump cleanup.log
stop ost ${FORCE} --dump cleanup.log
}
-replay() {
- do_mds "sync"
- do_mds 'echo -e "device \$mds1\\nprobe\\nnotransno\\nreadonly" | lctl'
- do_client "$1" &
- shutdown_mds -f
- start_mds
- wait
- do_client "df -h $MOUNT" # trigger failover, if we haven't already
-}
-
if [ ! -z "$EVAL" ]; then
eval "$EVAL"
exit $?
fi
+if [ "$ONLY" == "setup" ]; then
+ setup
+ exit
+fi
+
if [ "$ONLY" == "cleanup" ]; then
sysctl -w portals.debug=0 || true
cleanup
test_1() {
drop_request "mcreate $MOUNT/1" || return 1
- drop_reply "mcreate $MOUNT/2" || return 2
+ drop_reint_reply "mcreate $MOUNT/2" || return 2
}
run_test 1 "mcreate: drop req, drop rep"
test_2() {
drop_request "tchmod 111 $MOUNT/2" || return 1
- drop_reply "tchmod 666 $MOUNT/2" || return 2
+ drop_reint_reply "tchmod 666 $MOUNT/2" || return 2
}
run_test 2 "chmod: drop req, drop rep"
test_5() {
drop_request "mv $MOUNT/resolv.conf $MOUNT/renamed" || return 1
- drop_reply "mv $MOUNT/renamed $MOUNT/renamed-again" || return 2
+ drop_reint_reply "mv $MOUNT/renamed $MOUNT/renamed-again" || return 2
do_facet client "checkstat -v $MOUNT/renamed-again" || return 3
}
run_test 5 "rename: drop req, drop rep"
test_6() {
drop_request "mlink $MOUNT/renamed-again $MOUNT/link1" || return 1
- drop_reply "mlink $MOUNT/renamed-again $MOUNT/link2" || return 2
+ drop_reint_reply "mlink $MOUNT/renamed-again $MOUNT/link2" || return 2
}
run_test 6 "link: drop req, drop rep"
test_7() {
drop_request "munlink $MOUNT/link1" || return 1
- drop_reply "munlink $MOUNT/link2" || return 2
+ drop_reint_reply "munlink $MOUNT/link2" || return 2
}
run_test 7 "unlink: drop req, drop rep"
-
#bug 1423
test_8() {
- drop_reply "touch $MOUNT/renamed" || return 1
+ drop_reint_reply "touch $MOUNT/renamed" || return 1
}
run_test 8 "touch: drop rep (bug 1423)"
-
#bug 1420
test_9() {
pause_bulk "cp /etc/profile $MOUNT" || return 1
}
run_test 15 "failed open (-ENOMEM)"
+stop_read_ahead() {
+ for f in /proc/fs/lustre/llite/*/read_ahead; do
+ echo 0 > $f
+ done
+}
+
+start_read_ahead() {
+ for f in /proc/fs/lustre/llite/*/read_ahead; do
+ echo 1 > $f
+ done
+}
+
test_16() {
do_facet client cp /etc/termcap $MOUNT
sync
+ stop_read_ahead
#define OBD_FAIL_PTLRPC_BULK_PUT_NET 0x504 | OBD_FAIL_ONCE
sysctl -w lustre.fail_loc=0x80000504
cancel_lru_locks OSC
# will get evicted here
- do_facet client "diff /etc/termcap $MOUNT/termcap" && return 1
+ do_facet client "cmp /etc/termcap $MOUNT/termcap" && return 1
sysctl -w lustre.fail_loc=0
- do_facet client "diff /etc/termcap $MOUNT/termcap" || return 2
+ # give recovery a chance to finish (shouldn't take long)
+ sleep $TIMEOUT
+ do_facet client "cmp /etc/termcap $MOUNT/termcap" || return 2
+ start_read_ahead
}
run_test 16 "timeout bulk put, evict client (2732)"
test_17() {
-# OBD_FAIL_PTLRPC_BULK_GET_NET | OBD_FAIL_ONCE
- # wil get evicted here
+ # OBD_FAIL_PTLRPC_BULK_GET_NET 0x0503 | OBD_FAIL_ONCE
+ # client will get evicted here
sysctl -w lustre.fail_loc=0x80000503
- do_facet client cp /etc/termcap $MOUNT && return 1
-
- do_facet client "diff /etc/termcap $MOUNT/termcap" && return 1
+ do_facet client cp /etc/termcap $DIR/$tfile
sysctl -w lustre.fail_loc=0
- do_facet client "diff /etc/termcap $MOUNT/termcap" || return 2
+ sleep $TIMEOUT
+ # expect cmp to fail
+ do_facet client "cmp /etc/termcap $DIR/$tfile" && return 1
+ do_facet client "rm $DIR/$tfile" || return 2
+ return 0
}
run_test 17 "timeout bulk get, evict client (2732)"
}
run_test 18b "eviction and reconnect clears page cache (2766)"
-test_19a() { # bug 2983 - ldlm_handle_enqueue cleanup
- mkdir -p $DIR/d19
- multiop $DIR/d19/f19a O_wc &
+test_19a() {
+ f=$MOUNT/$tfile
+ do_facet client mcreate $f || return 1
+ drop_ldlm_cancel "chmod 0777 $f" || echo evicted
+
+ do_facet client checkstat -v -p 0777 $f || echo evicted
+ do_facet client "munlink $f"
+}
+run_test 19a "test expired_lock_main on mds (2867)"
+
+test_19b() {
+ f=$MOUNT/$tfile
+ do_facet client multiop $f Ow || return 1
+ do_facet client multiop $f or || return 2
+
+ cancel_lru_locks OSC
+
+ do_facet client multiop $f or || return 3
+ drop_ldlm_cancel multiop $f Ow || echo "client evicted, as expected"
+
+ do_facet client munlink $f || return 4
+}
+run_test 19b "test expired_lock_main on ost (2867)"
+
+test_20a() { # bug 2983 - ldlm_handle_enqueue cleanup
+ mkdir -p $DIR/$tdir
+ multiop $DIR/$tdir/${tfile} O_wc &
MULTI_PID=$!
usleep 500
cancel_lru_locks OSC
#define OBD_FAIL_LDLM_ENQUEUE_EXTENT_ERR 0x308
do_facet ost sysctl -w lustre.fail_loc=0x80000308
kill -USR1 $MULTI_PID
- wait $MULTI_PID && error "multiop didn't fail enqueue" || true
+ wait $MULTI_PID
+ rc=$?
+ [ $rc -eq 0 ] && error "multiop didn't fail enqueue: rc $rc" || true
}
-run_test 19a "ldlm_handle_enqueue error (should return error) ==="
+run_test 20a "ldlm_handle_enqueue error (should return error)"
-test_19b() { # bug 2986 - ldlm_handle_enqueue error during open
- mkdir $DIR/d19
- touch $DIR/d19/f19b
+test_20b() { # bug 2986 - ldlm_handle_enqueue error during open
+ mkdir -p $DIR/$tdir
+ touch $DIR/$tdir/${tfile}
cancel_lru_locks OSC
#define OBD_FAIL_LDLM_ENQUEUE_EXTENT_ERR 0x308
do_facet ost sysctl -w lustre.fail_loc=0x80000308
- dd if=/etc/hosts of=$DIR/d19/f19b && error "didn't fail enqueue" || true
+ dd if=/etc/hosts of=$DIR/$tdir/$tfile && \
+ error "didn't fail open enqueue" || true
}
-run_test 19b "ldlm_handle_enqueue error (should return error) ==="
-
+run_test 20b "ldlm_handle_enqueue error (should return error)"
$CLEANUP
git://git.whamcloud.com / fs / lustre-release.git / blobdiff