}
writeconf() {
- local facet=$SINGLEMDS
- local dev=${facet}_dev
- shift
- stop ${facet} -f
- rm -f ${facet}active
- # who knows if/where $TUNEFS is installed? Better reformat if it fails...
- do_facet ${facet} "$TUNEFS --writeconf ${!dev}" || echo "tunefs failed, reformatting instead" && reformat
+ local facet=$SINGLEMDS
+ local dev=${facet}_dev
+ shift
+ stop ${facet} -f
+ rm -f ${facet}active
+ # who knows if/where $TUNEFS is installed? Better reformat if it fails...
+ do_facet ${facet} "$TUNEFS --writeconf ${!dev}" || echo "tunefs failed, reformatting instead" && reformat
+
+ gen_config
}
gen_config() {
- reformat
- # The MGS must be started before the OSTs for a new fs, so start
- # and stop to generate the startup logs.
+ # The MGS must be started before the OSTs for a new fs, so start
+ # and stop to generate the startup logs.
start_mds
start_ost
sleep 5
stop_mds
}
+reformat_and_config() {
+ reformat
+ gen_config
+}
+
start_mds() {
local facet=$SINGLEMDS
# we can not use MDSDEV1 here because SINGLEMDS could be set not to mds1 only
#create single point mountpoint
-gen_config
+reformat_and_config
test_0() {
setup
start_ost
start_mds && return 42
- gen_config
+ reformat_and_config
}
run_test 17 "Verify failed mds_postsetup won't fail assertion (2936) (should return errs)"
MDS_MKFS_OPTS="--mgs --mdt --fsname=$FSNAME --device-size=$myMDSSIZE --param sys.timeout=$TIMEOUT $MDSOPT"
- gen_config
+ reformat_and_config
echo "mount lustre system..."
setup
check_mount || return 41
cleanup || return $?
MDS_MKFS_OPTS=$OLD_MDS_MKFS_OPTS
- gen_config
+ reformat_and_config
}
run_test 18 "check mkfs creates large journals"
cleanup_nocli
#writeconf to remove all ost2 traces for subsequent tests
writeconf
- start_mds
- start_ost
- sleep 5
- cleanup
}
run_test 29 "permanently remove an OST"
local fs2mdsdev=${fs2mds_DEV:-${MDSDEV}_2}
local fs2ostdev=${fs2ost_DEV:-$(ostdevname 1)_2}
- add fs2mds $MDS_MKFS_OPTS --fsname=${FSNAME2} --reformat $fs2mdsdev || exit 10
+ add fs2mds $MDS_MKFS_OPTS --mkfsoptions='\"-J size=8\"' --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 && trap cleanup_24a EXIT INT
# reformat after this test is needed - if test will failed
# we will have unkillable file at FS
- reformat
- setup_noconfig
- cleanup || error "can't cleanup"
+ reformat_and_config
}
test_48() { # bug 17636
test_49() { # bug 17710
local OLD_MDS_MKFS_OPTS=$MDS_MKFS_OPTS
local OLD_OST_MKFS_OPTS=$OST_MKFS_OPTS
- local OLD_TIMEOUT=$TIMEOUT
+ local LOCAL_TIMEOUT=20
- TIMEOUT=20
- MDS_MKFS_OPTS="--mgs --mdt --fsname=$FSNAME --device-size=$MDSSIZE --param sys.timeout=$TIMEOUT --param sys.ldlm_timeout=$TIMEOUT $MKFSOPT $MDSOPT"
+ OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$LOCAL_TIMEOUT --param sys.ldlm_timeout=$LOCAL_TIMEOUT $MKFSOPT $OSTOPT"
reformat
start_mds
LDLM_CLIENT="`do_facet client lctl get_param -n ldlm_timeout`"
if [ $LDLM_MDS -ne $LDLM_OST1 ] || [ $LDLM_MDS -ne $LDLM_CLIENT ]; then
- error "Different LDLM_TIMEOUT: $LDLM_MDS $LDLM_OST $LDLM_CLIENT"
+ error "Different LDLM_TIMEOUT:$LDLM_MDS $LDLM_OST1 $LDLM_CLIENT"
fi
- if [ $LDLM_MDS -ne $((TIMEOUT / 3)) ]; then
+ if [ $LDLM_MDS -ne $((LOCAL_TIMEOUT / 3)) ]; then
error "LDLM_TIMEOUT($LDLM_MDS) is not correct"
fi
stop_ost || return 2
stop_mds || return 3
- OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$TIMEOUT --param sys.ldlm_timeout=$((TIMEOUT - 1)) $MKFSOPT $OSTOPT"
+ OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$LOCAL_TIMEOUT --param sys.ldlm_timeout=$((LOCAL_TIMEOUT - 1)) $MKFSOPT $OSTOPT"
reformat
start_mds || return 4
LDLM_CLIENT="`do_facet client lctl get_param -n ldlm_timeout`"
if [ $LDLM_MDS -ne $LDLM_OST1 ] || [ $LDLM_MDS -ne $LDLM_CLIENT ]; then
- error "Different LDLM_TIMEOUT: $LDLM_MDS $LDLM_OST $LDLM_CLIENT"
+ error "Different LDLM_TIMEOUT:$LDLM_MDS $LDLM_OST1 $LDLM_CLIENT"
fi
- if [ $LDLM_MDS -ne $((TIMEOUT - 1)) ]; then
+ if [ $LDLM_MDS -ne $((LOCAL_TIMEOUT - 1)) ]; then
error "LDLM_TIMEOUT($LDLM_MDS) is not correct"
fi