i=Nathan.Rutman
includes t-f:combined_mgs_mds ()
stop ${facet} -f
rm -f ${facet}active
# who knows if/where $TUNEFS is installed? Better reformat if it fails...
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
+ do_facet ${facet} "$TUNEFS --writeconf ${!dev}" ||
+ echo "tunefs failed, reformatting instead" && reformat_and_config
reformat_and_config() {
reformat
reformat_and_config() {
reformat
+ if ! combined_mgs_mds ; then
+ start_mgs
+ fi
+start_mgs () {
+ echo "start mgs"
+ start mgs $MGSDEV $mgs_MOUNT_OPTS
+}
+
start_mds() {
local facet=$SINGLEMDS
# we can not use MDSDEV1 here because SINGLEMDS could be set not to mds1 only
start_mds() {
local facet=$SINGLEMDS
# we can not use MDSDEV1 here because SINGLEMDS could be set not to mds1 only
+ if ! combined_mgs_mds ; then
+ start_mgs
+ fi
+
start_mds
start_ost
mount_client $MOUNT
start_mds
start_ost
mount_client $MOUNT
local PID1
local PID2
local WAIT=0
local PID1
local PID2
local WAIT=0
local sleep=1
while [ "$WAIT" -lt "$MAX_WAIT" ]; do
sleep $sleep
local sleep=1
while [ "$WAIT" -lt "$MAX_WAIT" ]; do
sleep $sleep
echo "waiting for mount to finish ... "
WAIT=$(( WAIT + sleep))
done
echo "waiting for mount to finish ... "
WAIT=$(( WAIT + sleep))
done
- [ "$WAIT" -eq "$MAX_WAIT" ] && error "MOUNT_PID $MOUNT_PID and "\
+ if [ "$WAIT" -eq "$MAX_WAIT" ]; then
+ error "MOUNT_PID $MOUNT_PID and "\
"MOUNT_LUSTRE_PID $MOUNT_LUSTRE_PID still not killed in $WAIT secs"
"MOUNT_LUSTRE_PID $MOUNT_LUSTRE_PID still not killed in $WAIT secs"
+ ps -ef | grep mount
+ fi
stop_mds || error
stop_ost || error
}
stop_mds || error
stop_ost || error
}
test_46a() {
echo "Testing with $OSTCOUNT OSTs"
test_46a() {
echo "Testing with $OSTCOUNT OSTs"
start_mds || return 1
#first client should see only one ost
start_ost || return 2
start_mds || return 1
#first client should see only one ost
start_ost || return 2
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
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
- start_ost
- mount_client $MOUNT
check_mount || return 1
echo "check ldlm_timout..."
check_mount || return 1
echo "check ldlm_timout..."
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
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
- start_ost || return 5
- mount_client $MOUNT || return 6
check_mount || return 7
LDLM_MDS="`do_facet mds lctl get_param -n ldlm_timeout`"
check_mount || return 7
LDLM_MDS="`do_facet mds lctl get_param -n ldlm_timeout`"
local LOCAL_TIMEOUT=20
reformat
local LOCAL_TIMEOUT=20
reformat
- start_mds
- start_ost
- mount_client $MOUNT
check_mount || return 1
mkdir $MOUNT/d1
check_mount || return 1
mkdir $MOUNT/d1
}
run_test 53b "check MDT thread count params"
}
run_test 53b "check MDT thread count params"
+if ! combined_mgs_mds ; then
+ stop mgs
+fi
+
cleanup_gss
equals_msg `basename $0`: test complete
[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true
cleanup_gss
equals_msg `basename $0`: test complete
[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true
rm -f $TMP/ost${num}active
done
rm -f $TMP/ost${num}active
done
+ if ! combined_mgs_mds ; then
+ stop mgs
+ fi
+
test $nr = 1 && echo -n $MDS_MKFS_OPTS || echo -n $MDSn_MKFS_OPTS
}
test $nr = 1 && echo -n $MDS_MKFS_OPTS || echo -n $MDSn_MKFS_OPTS
}
+combined_mgs_mds () {
+ [[ $MDSDEV1 = $MGSDEV ]] && [[ $mds1_HOST = $mgs_HOST ]]
+}
+
formatall() {
if [ "$IAMDIR" == "yes" ]; then
MDS_MKFS_OPTS="$MDS_MKFS_OPTS --iam-dir"
formatall() {
if [ "$IAMDIR" == "yes" ]; then
MDS_MKFS_OPTS="$MDS_MKFS_OPTS --iam-dir"
load_modules
[ "$CLIENTONLY" ] && return
echo Formatting mgs, mds, osts
load_modules
[ "$CLIENTONLY" ] && return
echo Formatting mgs, mds, osts
- if [[ $MDSDEV1 != $MGSDEV ]] || [[ $mds1_HOST != $mgs_HOST ]]; then
+ if ! combined_mgs_mds ; then
add mgs $mgs_MKFS_OPTS $FSTYPE_OPT --reformat $MGSDEV || exit 10
fi
add mgs $mgs_MKFS_OPTS $FSTYPE_OPT --reformat $MGSDEV || exit 10
fi
echo Setup mgs, mdt, osts
echo $WRITECONF | grep -q "writeconf" && \
writeconf_all
echo Setup mgs, mdt, osts
echo $WRITECONF | grep -q "writeconf" && \
writeconf_all
- if [[ $mds1_HOST != $mgs_HOST ]] || [[ $MDSDEV1 != $MGSDEV ]]; then
+ if ! combined_mgs_mds ; then
start mgs $MGSDEV $mgs_MOUNT_OPTS
fi
start mgs $MGSDEV $mgs_MOUNT_OPTS
fi
- if [[ $MDSDEV1 != $MGSDEV ]]; then
- stop mgs
- fi
-