diff --git a/lustre/tests/cfg/lmv.sh b/lustre/tests/cfg/lmv.sh
index 0ad7ed7d8ca402d62f7eba494938b6e2bc155364..e75538d8aeb313c6324fcf6135510264076294b8 100644
--- a/lustre/tests/cfg/lmv.sh
+++ b/lustre/tests/cfg/lmv.sh
@@ -30,6 +30,7 @@ FSTYPE=${FSTYPE:-ext3}
TIMEOUT=${TIMEOUT:-10}
UPCALL=${UPCALL:-$PWD/replay-single-upcall.sh}
+SINGLEMDS=${SINGLEMDS:-"mds1"}
STRIPE_BYTES=${STRIPE_BYTES:-65536}
STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}
diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index e739ba1e5f010adc8a5dec8fe60953226d577aa8..460c6f55bc04cf68e84e0aa99336dd62aab30937 100644
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -29,6 +29,7 @@ OSTSIZE=${OSTSIZE:-50000}
FSTYPE=${FSTYPE:-ext3}
TIMEOUT=${TIMEOUT:-20}
UPCALL=${UPCALL:-DEFAULT}
+SINGLEMDS=${SINGLEMDS:-"mds1"}
STRIPE_BYTES=${STRIPE_BYTES:-524288}
STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}
diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 52e305859e6d7c81bd223288ae58cb1f1b1ebc79..b2c2616943cb3608439add5b7214804a0df208c9 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -39,13 +39,13 @@ gen_config() {
--stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
MDS=lmv1
else
- add_mds mds1 --dev $MDSDEV --size $MDSSIZE
- if [ ! -z "$mds1failover_HOST" ]; then
- add_mdsfailover mds1 --dev $MDSDEV --size $MDSSIZE
+ add_mds $SINGLEMDS --dev $MDSDEV --size $MDSSIZE
+ if [ ! -z "$$SINGLEMDSfailover_HOST" ]; then
+ add_mdsfailover $SINGLEMDS --dev $MDSDEV --size $MDSSIZE
fi
- add_lov lov1 mds1 --stripe_sz $STRIPE_BYTES \
+ add_lov lov1 $SINGLEMDS --stripe_sz $STRIPE_BYTES \
--stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
- MDS=mds1_svc
+ MDS=$SINGLEMDS_svc
fi
add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
@@ -58,9 +58,9 @@ build_test_filter
cleanup() {
# make sure we are using the primary MDS, so the config log will
# be able to clean up properly.
- activemds=`facet_active mds1`
- if [ $activemds != "mds1" ]; then
- fail mds1
+ activemds=`facet_active $SINGLEMDS`
+ if [ $activemds != "$SINGLEMDS" ]; then
+ fail $SINGLEMDS
fi
zconf_umount `hostname` $MOUNT
for mds in `mds_list`; do
@@ -105,8 +105,8 @@ fi
mkdir -p $DIR
test_0() {
- replay_barrier mds1
- fail mds1
+ replay_barrier $SINGLEMDS
+ fail $SINGLEMDS
}
run_test 0 "empty replay"
@@ -125,28 +125,28 @@ test_0c() {
return 0
fi
# drop gss error notification
- replay_barrier mds1
- fail_drop mds1 0x760
+ replay_barrier $SINGLEMDS
+ fail_drop $SINGLEMDS 0x760
# drop gss init request
- replay_barrier mds1
- fail_drop mds1 0x780
+ replay_barrier $SINGLEMDS
+ fail_drop $SINGLEMDS 0x780
}
run_test 0c "empty replay with gss init failures"
test_1() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
mcreate $DIR/$tfile
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t file $DIR/$tfile || return 1
rm $DIR/$tfile
}
run_test 1 "simple create"
test_2a() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
touch $DIR/$tfile
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t file $DIR/$tfile || return 1
rm $DIR/$tfile
}
@@ -154,43 +154,43 @@ run_test 2a "touch"
test_2b() {
./mcreate $DIR/$tfile
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
touch $DIR/$tfile
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t file $DIR/$tfile || return 1
rm $DIR/$tfile
}
run_test 2b "touch"
test_3a() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
mcreate $DIR/$tfile
o_directory $DIR/$tfile
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t file $DIR/$tfile || return 2
rm $DIR/$tfile
}
run_test 3a "replay failed open(O_DIRECTORY)"
test_3b() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
#define OBD_FAIL_MDS_OPEN_PACK | OBD_FAIL_ONCE
do_facet mds "sysctl -w lustre.fail_loc=0x80000114"
touch $DIR/$tfile
do_facet mds "sysctl -w lustre.fail_loc=0"
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t file $DIR/$tfile && return 2
return 0
}
run_test 3b "replay failed open -ENOMEM"
test_3c() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
#define OBD_FAIL_MDS_ALLOC_OBDO | OBD_FAIL_ONCE
do_facet mds "sysctl -w lustre.fail_loc=0x80000128"
touch $DIR/$tfile
do_facet mds "sysctl -w lustre.fail_loc=0"
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t file $DIR/$tfile && return 2
return 0
@@ -198,11 +198,11 @@ test_3c() {
run_test 3c "replay failed open -ENOMEM"
test_4() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
for i in `seq 10`; do
echo "tag-$i" > $DIR/$tfile-$i
done
- fail mds1
+ fail $SINGLEMDS
for i in `seq 10`; do
grep -q "tag-$i" $DIR/$tfile-$i || error "$tfile-$i"
done
@@ -210,9 +210,9 @@ test_4() {
run_test 4 "|x| 10 open(O_CREAT)s"
test_4b() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
rm -rf $DIR/$tfile-*
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t file $DIR/$tfile-* && return 1 || true
}
run_test 4b "|x| rm 10 files"
@@ -220,11 +220,11 @@ run_test 4b "|x| rm 10 files"
# The idea is to get past the first block of precreated files on both
# osts, and then replay.
test_5() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
for i in `seq 220`; do
echo "tag-$i" > $DIR/$tfile-$i
done
- fail mds1
+ fail $SINGLEMDS
for i in `seq 220`; do
grep -q "tag-$i" $DIR/$tfile-$i || error "f1c-$i"
done
@@ -236,10 +236,10 @@ run_test 5 "|x| 220 open(O_CREAT)"
test_6() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
mkdir $DIR/$tdir
mcreate $DIR/$tdir/$tfile
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t dir $DIR/$tdir || return 1
$CHECKSTAT -t file $DIR/$tdir/$tfile || return 2
sleep 2
@@ -248,18 +248,18 @@ test_6() {
run_test 6 "mkdir + contained create"
test_6b() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
rm -rf $DIR/$tdir
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t dir $DIR/$tdir && return 1 || true
}
run_test 6b "|X| rmdir"
test_7() {
mkdir $DIR/$tdir
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
mcreate $DIR/$tdir/$tfile
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t dir $DIR/$tdir || return 1
$CHECKSTAT -t file $DIR/$tdir/$tfile || return 2
rm -fr $DIR/$tdir
@@ -267,11 +267,11 @@ test_7() {
run_test 7 "mkdir |X| contained create"
test_8() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
multiop $DIR/$tfile mo_c &
MULTIPID=$!
sleep 1
- fail mds1
+ fail $SINGLEMDS
ls $DIR/$tfile
$CHECKSTAT -t file $DIR/$tfile || return 1
kill -USR1 $MULTIPID || return 2
@@ -281,10 +281,10 @@ test_8() {
run_test 8 "creat open |X| close"
test_9() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
mcreate $DIR/$tfile
local old_inum=`ls -i $DIR/$tfile | awk '{print $1}'`
- fail mds1
+ fail $SINGLEMDS
local new_inum=`ls -i $DIR/$tfile | awk '{print $1}'`
echo " old_inum == $old_inum, new_inum == $new_inum"
@@ -301,10 +301,10 @@ run_test 9 "|X| create (same inum/gen)"
test_10() {
mcreate $DIR/$tfile
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
mv $DIR/$tfile $DIR/$tfile-2
rm -f $DIR/$tfile
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT $DIR/$tfile && return 1
$CHECKSTAT $DIR/$tfile-2 || return 2
@@ -317,11 +317,11 @@ test_11() {
mcreate $DIR/$tfile
echo "old" > $DIR/$tfile
mv $DIR/$tfile $DIR/$tfile-2
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
echo "new" > $DIR/$tfile
grep new $DIR/$tfile
grep old $DIR/$tfile-2
- fail mds1
+ fail $SINGLEMDS
grep new $DIR/$tfile || return 1
grep old $DIR/$tfile-2 || return 2
}
@@ -334,11 +334,11 @@ test_12() {
# give multiop a chance to open
sleep 1
rm -f $DIR/$tfile
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
kill -USR1 $pid
wait $pid || return 1
- fail mds1
+ fail $SINGLEMDS
[ -e $DIR/$tfile ] && return 2
return 0
}
@@ -355,8 +355,8 @@ test_13() {
sleep 1
chmod 0 $DIR/$tfile
$CHECKSTAT -p 0 $DIR/$tfile
- replay_barrier mds1
- fail mds1
+ replay_barrier $SINGLEMDS
+ fail $SINGLEMDS
kill -USR1 $pid
wait $pid || return 1
@@ -371,11 +371,11 @@ test_14() {
# give multiop a chance to open
sleep 1
rm -f $DIR/$tfile
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
kill -USR1 $pid || return 1
wait $pid || return 2
- fail mds1
+ fail $SINGLEMDS
[ -e $DIR/$tfile ] && return 3
return 0
}
@@ -387,12 +387,12 @@ test_15() {
# give multiop a chance to open
sleep 1
rm -f $DIR/$tfile
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
touch $DIR/g11 || return 1
kill -USR1 $pid
wait $pid || return 2
- fail mds1
+ fail $SINGLEMDS
[ -e $DIR/$tfile ] && return 3
touch $DIR/h11 || return 4
return 0
@@ -401,11 +401,11 @@ run_test 15 "open(O_CREAT), unlink |X| touch new, close"
test_16() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
mcreate $DIR/$tfile
munlink $DIR/$tfile
mcreate $DIR/$tfile-2
- fail mds1
+ fail $SINGLEMDS
[ -e $DIR/$tfile ] && return 1
[ -e $DIR/$tfile-2 ] || return 2
munlink $DIR/$tfile-2 || return 3
@@ -413,12 +413,12 @@ test_16() {
run_test 16 "|X| open(O_CREAT), unlink, touch new, unlink new"
test_17() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
multiop $DIR/$tfile O_c &
pid=$!
# give multiop a chance to open
sleep 1
- fail mds1
+ fail $SINGLEMDS
kill -USR1 $pid || return 1
wait $pid || return 2
$CHECKSTAT -t file $DIR/$tfile || return 3
@@ -427,7 +427,7 @@ test_17() {
run_test 17 "|X| open(O_CREAT), |replay| close"
test_18() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
multiop $DIR/$tfile O_tSc &
pid=$!
# give multiop a chance to open
@@ -438,7 +438,7 @@ test_18() {
kill -USR1 $pid
wait $pid || return 2
- fail mds1
+ fail $SINGLEMDS
[ -e $DIR/$tfile ] && return 3
[ -e $DIR/$tfile-2 ] || return 4
# this touch frequently fails
@@ -451,25 +451,25 @@ run_test 18 "|X| open(O_CREAT), unlink, touch new, close, touch, unlink"
# bug 1855 (a simpler form of test_11 above)
test_19() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
mcreate $DIR/$tfile
echo "old" > $DIR/$tfile
mv $DIR/$tfile $DIR/$tfile-2
grep old $DIR/$tfile-2
- fail mds1
+ fail $SINGLEMDS
grep old $DIR/$tfile-2 || return 2
}
run_test 19 "|X| mcreate, open, write, rename "
test_20() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
multiop $DIR/$tfile O_tSc &
pid=$!
# give multiop a chance to open
sleep 1
rm -f $DIR/$tfile
- fail mds1
+ fail $SINGLEMDS
kill -USR1 $pid
wait $pid || return 1
[ -e $DIR/$tfile ] && return 2
@@ -478,7 +478,7 @@ test_20() {
run_test 20 "|X| open(O_CREAT), unlink, replay, close (test mds_cleanup_orphans)"
test_21() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
multiop $DIR/$tfile O_tSc &
pid=$!
# give multiop a chance to open
@@ -486,7 +486,7 @@ test_21() {
rm -f $DIR/$tfile
touch $DIR/g11 || return 1
- fail mds1
+ fail $SINGLEMDS
kill -USR1 $pid
wait $pid || return 2
[ -e $DIR/$tfile ] && return 3
@@ -501,10 +501,10 @@ test_22() {
# give multiop a chance to open
sleep 1
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
rm -f $DIR/$tfile
- fail mds1
+ fail $SINGLEMDS
kill -USR1 $pid
wait $pid || return 1
[ -e $DIR/$tfile ] && return 2
@@ -518,11 +518,11 @@ test_23() {
# give multiop a chance to open
sleep 1
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
rm -f $DIR/$tfile
touch $DIR/g11 || return 1
- fail mds1
+ fail $SINGLEMDS
kill -USR1 $pid
wait $pid || return 2
[ -e $DIR/$tfile ] && return 3
@@ -537,8 +537,8 @@ test_24() {
# give multiop a chance to open
sleep 1
- replay_barrier mds1
- fail mds1
+ replay_barrier $SINGLEMDS
+ fail $SINGLEMDS
rm -f $DIR/$tfile
kill -USR1 $pid
wait $pid || return 1
@@ -554,8 +554,8 @@ test_25() {
sleep 1
rm -f $DIR/$tfile
- replay_barrier mds1
- fail mds1
+ replay_barrier $SINGLEMDS
+ fail $SINGLEMDS
kill -USR1 $pid
wait $pid || return 1
[ -e $DIR/$tfile ] && return 2
@@ -564,7 +564,7 @@ test_25() {
run_test 25 "open(O_CREAT), unlink, replay, close (test mds_cleanup_orphans)"
test_26() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
multiop $DIR/$tfile-1 O_tSc &
pid1=$!
multiop $DIR/$tfile-2 O_tSc &
@@ -576,7 +576,7 @@ test_26() {
kill -USR1 $pid2
wait $pid2 || return 1
- fail mds1
+ fail $SINGLEMDS
kill -USR1 $pid1
wait $pid1 || return 2
[ -e $DIR/$tfile-1 ] && return 3
@@ -586,7 +586,7 @@ test_26() {
run_test 26 "|X| open(O_CREAT), unlink two, close one, replay, close one (test mds_cleanup_orphans)"
test_27() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
multiop $DIR/$tfile-1 O_tSc &
pid1=$!
multiop $DIR/$tfile-2 O_tSc &
@@ -596,7 +596,7 @@ test_27() {
rm -f $DIR/$tfile-1
rm -f $DIR/$tfile-2
- fail mds1
+ fail $SINGLEMDS
kill -USR1 $pid1
wait $pid1 || return 1
kill -USR1 $pid2
@@ -614,13 +614,13 @@ test_28() {
pid2=$!
# give multiop a chance to open
sleep 1
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
rm -f $DIR/$tfile-1
rm -f $DIR/$tfile-2
kill -USR1 $pid2
wait $pid2 || return 1
- fail mds1
+ fail $SINGLEMDS
kill -USR1 $pid1
wait $pid1 || return 2
[ -e $DIR/$tfile-1 ] && return 3
@@ -636,11 +636,11 @@ test_29() {
pid2=$!
# give multiop a chance to open
sleep 1
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
rm -f $DIR/$tfile-1
rm -f $DIR/$tfile-2
- fail mds1
+ fail $SINGLEMDS
kill -USR1 $pid1
wait $pid1 || return 1
kill -USR1 $pid2
@@ -661,8 +661,8 @@ test_30() {
rm -f $DIR/$tfile-1
rm -f $DIR/$tfile-2
- replay_barrier mds1
- fail mds1
+ replay_barrier $SINGLEMDS
+ fail $SINGLEMDS
kill -USR1 $pid1
wait $pid1 || return 1
kill -USR1 $pid2
@@ -682,9 +682,9 @@ test_31() {
sleep 1
rm -f $DIR/$tfile-1
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
rm -f $DIR/$tfile-2
- fail mds1
+ fail $SINGLEMDS
kill -USR1 $pid1
wait $pid1 || return 1
kill -USR1 $pid2
@@ -715,9 +715,9 @@ run_test 32 "close() notices client eviction; close() after client eviction"
# Abort recovery before client complete
test_33() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
touch $DIR/$tfile
- fail_abort mds1
+ fail_abort $SINGLEMDS
# this file should be gone, because the replay was aborted
$CHECKSTAT -t file $DIR/$tfile && return 1
return 0
@@ -731,8 +731,8 @@ test_34() {
sleep 1
rm -f $DIR/$tfile
- replay_barrier mds1
- fail_abort mds1
+ replay_barrier $SINGLEMDS
+ fail_abort $SINGLEMDS
kill -USR1 $pid
[ -e $DIR/$tfile ] && return 1
sync
@@ -751,7 +751,7 @@ test_35() {
sync
sleep 1
# give a chance to remove from MDS
- fail_abort mds1
+ fail_abort $SINGLEMDS
$CHECKSTAT -t file $DIR/$tfile && return 1 || true
}
run_test 35 "test recovery from llog for unlink op"
@@ -759,10 +759,10 @@ run_test 35 "test recovery from llog for unlink op"
# b=2432 resent cancel after replay uses wrong cookie,
# so don't resend cancels
test_36() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
touch $DIR/$tfile
checkstat $DIR/$tfile
- facet_failover mds1
+ facet_failover $SINGLEMDS
cancel_lru_locks MDC
if dmesg | grep "unknown lock cookie"; then
echo "cancel after replay failed"
@@ -781,10 +781,10 @@ test_37() {
sleep 1
rmdir $DIR/$tfile
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
# clear the dmesg buffer so we only see errors from this recovery
dmesg -c >/dev/null
- fail_abort mds1
+ fail_abort $SINGLEMDS
kill -USR1 $pid
dmesg | grep "mds_unlink_orphan.*error .* unlinking orphan" && return 1
sync
@@ -795,8 +795,8 @@ run_test 37 "abort recovery before client does replay (test mds_cleanup_orphans
test_38() {
createmany -o $DIR/$tfile-%d 800
unlinkmany $DIR/$tfile-%d 0 400
- replay_barrier mds1
- fail mds1
+ replay_barrier $SINGLEMDS
+ fail $SINGLEMDS
unlinkmany $DIR/$tfile-%d 400 400
sleep 2
$CHECKSTAT -t file $DIR/$tfile-* && return 1 || true
@@ -805,9 +805,9 @@ run_test 38 "test recovery from unlink llog (test llog_gen_rec) "
test_39() {
createmany -o $DIR/$tfile-%d 800
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
unlinkmany $DIR/$tfile-%d 0 400
- fail mds1
+ fail $SINGLEMDS
unlinkmany $DIR/$tfile-%d 400 400
sleep 2
$CHECKSTAT -t file $DIR/$tfile-* && return 1 || true
@@ -827,7 +827,7 @@ test_40(){
writeme -s $MOUNT/${tfile}-2 &
WRITE_PID=$!
sleep 1
- facet_failover mds1
+ facet_failover $SINGLEMDS
#define OBD_FAIL_MDS_CONNECT_NET 0x117
do_facet mds "sysctl -w lustre.fail_loc=0x80000117"
kill -USR1 $PID
@@ -899,11 +899,11 @@ run_test 42 "recovery after ost failure"
# b=2530
# timeout in MDS/OST recovery RPC will LBUG MDS
test_43() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
# OBD_FAIL_OST_CREATE_NET 0x204
do_facet ost "sysctl -w lustre.fail_loc=0x80000204"
- facet_failover mds1
+ facet_failover $SINGLEMDS
df $MOUNT || return 1
sleep 10
do_facet ost "sysctl -w lustre.fail_loc=0"
@@ -950,7 +950,7 @@ run_test 45 "Handle failed close"
test_46() {
dmesg -c >/dev/null
drop_reply "touch $DIR/$tfile"
- fail mds1
+ fail $SINGLEMDS
# ironically, the previous test, 45, will cause a real forced close,
# so just look for one for this test
dmesg | grep -i "force closing client file handle for $tfile" && return 1
@@ -995,8 +995,8 @@ test_48() {
$CHECKSTAT $DIR/${tfile}-99 || return 3
dmesg -c >/dev/null
- replay_barrier mds1
- fail mds1
+ replay_barrier $SINGLEMDS
+ fail $SINGLEMDS
unlinkmany $DIR/${tfile}- 100 || return 4
if dmesg | grep "back in time"; then
echo "server went back in time!"
@@ -1008,17 +1008,17 @@ run_test 48 "Don't lose transno when client is evicted (2525)"
# b=3550 - replay of unlink
test_49() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
createmany -o $DIR/$tfile-%d 400 || return 1
unlinkmany $DIR/$tfile-%d 0 400 || return 2
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t file $DIR/$tfile-* && return 3 || true
}
run_test 49 "re-write records to llog as written during fail"
test_50() {
local osc_dev=`$LCTL device_list | \
- awk '(/ost_svc_mds1_svc/){print $4}' `
+ awk '(/ost_svc_$SINGLEMDS_svc/){print $4}' `
$LCTL --device %$osc_dev recover && $LCTL --device %$osc_dev recover
# give the mds_lov_sync threads a chance to run
sleep 5
@@ -1027,7 +1027,7 @@ run_test 50 "Double OSC recovery, don't LASSERT (3812)"
# bug 3462 - simultaneous MDC requests
test_51a() {
- replay_barrier_nodf mds1
+ replay_barrier_nodf $SINGLEMDS
mkdir -p $DIR/${tdir}-1
mkdir -p $DIR/${tdir}-2
touch $DIR/${tdir}-2/f
@@ -1036,12 +1036,12 @@ test_51a() {
# give multiop a chance to open
sleep 1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000115"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000115"
kill -USR1 $pid
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
$CHECKSTAT -t file $DIR/${tdir}-2/f || return 1
- fail mds1
+ fail $SINGLEMDS
wait $pid || return 2
$CHECKSTAT -t file $DIR/${tdir}-1/f || return 3
@@ -1050,7 +1050,7 @@ test_51a() {
run_test 51a "|X| close request while two MDC requests in flight"
test_51b() {
- replay_barrier_nodf mds1
+ replay_barrier_nodf $SINGLEMDS
mkdir -p $DIR/$tdir-1
mkdir -p $DIR/$tdir-2
multiop $DIR/$tdir-1/f O_c &
@@ -1058,15 +1058,15 @@ test_51b() {
# give multiop a chance to open
sleep 1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000107"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000107"
touch $DIR/${tdir}-2/f &
usleep 500
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
kill -USR1 $pid
wait $pid || return 1
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t file $DIR/${tdir}-1/f || return 2
$CHECKSTAT -t file $DIR/${tdir}-2/f || return 3
@@ -1075,7 +1075,7 @@ test_51b() {
run_test 51b "|X| open request while two MDC requests in flight"
test_51c() {
- replay_barrier_nodf mds1
+ replay_barrier_nodf $SINGLEMDS
mkdir -p $DIR/${tdir}-1
mkdir -p $DIR/${tdir}-2
multiop $DIR/${tdir}-1/f O_c &
@@ -1083,15 +1083,15 @@ test_51c() {
# give multiop a chance to open
sleep 1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000107"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000107"
touch $DIR/${tdir}-2/f &
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000115"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000115"
kill -USR1 $pid
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
- fail mds1
+ fail $SINGLEMDS
wait $pid || return 1
$CHECKSTAT -t file $DIR/${tdir}-1/f || return 2
@@ -1101,7 +1101,7 @@ test_51c() {
run_test 51c "|X| open request and close request while two MDC requests in flight"
test_51d() {
- replay_barrier_nodf mds1
+ replay_barrier_nodf $SINGLEMDS
mkdir -p $DIR/${tdir}-1
mkdir -p $DIR/${tdir}-2
touch $DIR/${tdir}-2/f
@@ -1110,12 +1110,12 @@ test_51d() {
# give multiop a chance to open
sleep 1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000122"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000122"
kill -USR1 $pid
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
#$CHECKSTAT -t file $DIR/${tdir}-2/f || return 1
- fail mds1
+ fail $SINGLEMDS
wait $pid || return 2
$CHECKSTAT -t file $DIR/${tdir}-1/f || return 3
@@ -1124,7 +1124,7 @@ test_51d() {
run_test 51d "|X| close reply while two MDC requests in flight"
test_51e() {
- replay_barrier_nodf mds1
+ replay_barrier_nodf $SINGLEMDS
mkdir -p $DIR/$tdir-1
mkdir -p $DIR/$tdir-2
multiop $DIR/$tdir-1/f O_c &
@@ -1132,15 +1132,15 @@ test_51e() {
# give multiop a chance to open
sleep 1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000119"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000119"
touch $DIR/${tdir}-2/f &
usleep 500
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
kill -USR1 $pid
wait $pid || return 1
- fail mds1
+ fail $SINGLEMDS
$CHECKSTAT -t file $DIR/${tdir}-1/f || return 2
$CHECKSTAT -t file $DIR/${tdir}-2/f || return 3
@@ -1149,7 +1149,7 @@ test_51e() {
run_test 51e "|X| open reply while two MDC requests in flight"
test_51f() {
- replay_barrier_nodf mds1
+ replay_barrier_nodf $SINGLEMDS
mkdir -p $DIR/${tdir}-1
mkdir -p $DIR/${tdir}-2
multiop $DIR/${tdir}-1/f O_c &
@@ -1157,15 +1157,15 @@ test_51f() {
# give multiop a chance to open
sleep 1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000119"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000119"
touch $DIR/${tdir}-2/f &
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000122"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000122"
kill -USR1 $pid
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
- fail mds1
+ fail $SINGLEMDS
wait $pid || return 1
$CHECKSTAT -t file $DIR/${tdir}-1/f || return 2
@@ -1175,7 +1175,7 @@ test_51f() {
run_test 51f "|X| open reply and close reply while two MDC requests in flight"
test_51g() {
- replay_barrier_nodf mds1
+ replay_barrier_nodf $SINGLEMDS
mkdir -p $DIR/${tdir}-1
mkdir -p $DIR/${tdir}-2
multiop $DIR/${tdir}-1/f O_c &
@@ -1183,15 +1183,15 @@ test_51g() {
# give multiop a chance to open
sleep 1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000119"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000119"
touch $DIR/${tdir}-2/f &
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000115"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000115"
kill -USR1 $pid
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
- fail mds1
+ fail $SINGLEMDS
wait $pid || return 1
$CHECKSTAT -t file $DIR/${tdir}-1/f || return 2
@@ -1201,7 +1201,7 @@ test_51g() {
run_test 51g "|X| open reply and close request while two MDC requests in flight"
test_51h() {
- replay_barrier_nodf mds1
+ replay_barrier_nodf $SINGLEMDS
mkdir -p $DIR/${tdir}-1
mkdir -p $DIR/${tdir}-2
multiop $DIR/${tdir}-1/f O_c &
@@ -1209,15 +1209,15 @@ test_51h() {
# give multio:wp a chance to open
sleep 1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000107"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000107"
touch $DIR/${tdir}-2/f &
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000122"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000122"
kill -USR1 $pid
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
- fail mds1
+ fail $SINGLEMDS
wait $pid || return 1
$CHECKSTAT -t file $DIR/${tdir}-1/f || return 2
@@ -1232,37 +1232,37 @@ test_52() {
cancel_lru_locks MDC
multiop $DIR/$tfile s
- replay_barrier mds1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x8000030c"
- fail mds1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x0"
+ replay_barrier $SINGLEMDS
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x8000030c"
+ fail $SINGLEMDS
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x0"
$CHECKSTAT -t file $DIR/$tfile-* && return 3 || true
}
run_test 52 "time out lock replay (3764)"
test_53() {
- replay_barrier_nodf mds1
+ replay_barrier_nodf $SINGLEMDS
f1=$DIR/${tfile}-1
cat <<EOF > $f1
#!/bin/sh
true
EOF
chmod +x $f1
- do_facet mds1 "sysctl -w lustre.fail_loc=0x80000107"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x80000107"
$f1 || return 1
- do_facet mds1 "sysctl -w lustre.fail_loc=0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
- fail mds1
+ fail $SINGLEMDS
rm -f $f1
}
run_test 53 "|X| open request and close reply while two MDC requests in flight"
test_54() {
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
createmany -o $DIR/$tfile 20
unlinkmany $DIR/$tfile 20
- fail mds1
+ fail $SINGLEMDS
}
run_test 54 "|X| open request and close reply while two MDC requests in flight"
@@ -1270,9 +1270,9 @@ run_test 54 "|X| open request and close reply while two MDC requests in flight"
test_55() {
sysctl -w portals.debug=-1 portals.debug_mb=25
ln -s foo $DIR/$tfile
- replay_barrier mds1
+ replay_barrier $SINGLEMDS
#drop_reply "cat $DIR/$tfile"
- fail mds1
+ fail $SINGLEMDS
sleep 10
lctl dk /r/tmp/debug
}
@@ -1281,12 +1281,12 @@ run_test 55 "don't replay a symlink open request (3440)"
#b3761 ASSERTION(hash != 0) failed
test_56() {
# OBD_FAIL_MDS_OPEN_CREATE | OBD_FAIL_ONCE
- do_facet mds1 "sysctl -w lustre.fail_loc=0x8000012b"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x8000012b"
touch $DIR/$tfile
pid=$!
# give a chance for touch to run
sleep 5
- do_facet mds1 "sysctl -w lustre.fail_loc=0x0"
+ do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x0"
wait $pid || return 1
rm $DIR/$tfile
return 0