Move "run_one test_41b" to immediately follow declaration of test_41b.
Fix some whitespace problems (space before tab, space at end of line)
that I noticed while inspecting LU-574.
Change-Id: I18a80a55c9895cf8a6647a01ffa646f5ca499795
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/1200
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
- umount_client $MOUNT || return 200
+ umount_client $MOUNT || return 200
cleanup_nocli || return $?
}
cleanup_nocli || return $?
}
# cleanup may return an error from the failed
# disconnects; for now I'll consider this successful
# if all the modules have unloaded.
# cleanup may return an error from the failed
# disconnects; for now I'll consider this successful
# if all the modules have unloaded.
UMOUNT_PID=$!
sleep 6
echo "killing umount"
UMOUNT_PID=$!
sleep 6
echo "killing umount"
while [ "$WAIT" -ne "$MAX_WAIT" ]; do
sleep $sleep
grep -q $MOUNT" " /etc/mtab || break
while [ "$WAIT" -ne "$MAX_WAIT" ]; do
sleep $sleep
grep -q $MOUNT" " /etc/mtab || break
- echo "Waiting /etc/mtab updated ... "
+ echo "Waiting /etc/mtab updated ... "
WAIT=$(( WAIT + sleep))
done
[ "$WAIT" -eq "$MAX_WAIT" ] && error "/etc/mtab is not updated in $WAIT secs"
WAIT=$(( WAIT + sleep))
done
[ "$WAIT" -eq "$MAX_WAIT" ] && error "/etc/mtab is not updated in $WAIT secs"
stop $SINGLEMDS
# force down client so that recovering mds waits for reconnect
local running=$(grep -c $MOUNT /proc/mounts) || true
stop $SINGLEMDS
# force down client so that recovering mds waits for reconnect
local running=$(grep -c $MOUNT /proc/mounts) || true
- if [ $running -ne 0 ]; then
- echo "Stopping client $MOUNT (opts: -f)"
- umount -f $MOUNT
- fi
+ if [ $running -ne 0 ]; then
+ echo "Stopping client $MOUNT (opts: -f)"
+ umount -f $MOUNT
+ fi
# enter recovery on mds
start_mds
# enter recovery on mds
start_mds
facet_failover fs2mds
facet_failover fs2ost
df
facet_failover fs2mds
facet_failover fs2ost
df
# the MDS must remain up until last MDT
stop_mds
MDS=$(do_facet $SINGLEMDS "lctl get_param -n devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)
# the MDS must remain up until last MDT
stop_mds
MDS=$(do_facet $SINGLEMDS "lctl get_param -n devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)
set_and_check client "$TEST" "$PARAM" $FINAL || return 3
FINAL=$(($FINAL + 1))
set_and_check client "$TEST" "$PARAM" $FINAL || return 4
set_and_check client "$TEST" "$PARAM" $FINAL || return 3
FINAL=$(($FINAL + 1))
set_and_check client "$TEST" "$PARAM" $FINAL || return 4
- umount_client $MOUNT || return 200
+ umount_client $MOUNT || return 200
mount_client $MOUNT
RESULT=$($TEST)
if [ $RESULT -ne $FINAL ]; then
mount_client $MOUNT
RESULT=$($TEST)
if [ $RESULT -ne $FINAL ]; then
[ -n "$ENABLE_QUOTA" ] && { $LFS quotacheck -ug $MOUNT || error "quotacheck has failed" ; }
# test new client starts deactivated
[ -n "$ENABLE_QUOTA" ] && { $LFS quotacheck -ug $MOUNT || error "quotacheck has failed" ; }
# test new client starts deactivated
- umount_client $MOUNT || return 200
+ umount_client $MOUNT || return 200
mount_client $MOUNT
RESULT=$(lctl get_param -n $PROC_UUID | grep DEACTIV | grep NEW)
if [ -z "$RESULT" ]; then
mount_client $MOUNT
RESULT=$(lctl get_param -n $PROC_UUID | grep DEACTIV | grep NEW)
if [ -z "$RESULT" ]; then
# make sure it reactivates
set_and_check client "lctl get_param -n $PROC_ACT" "$PARAM" $ACTV || return 6
# make sure it reactivates
set_and_check client "lctl get_param -n $PROC_ACT" "$PARAM" $ACTV || return 6
stop_ost2
cleanup_nocli
#writeconf to remove all ost2 traces for subsequent tests
stop_ost2
cleanup_nocli
#writeconf to remove all ost2 traces for subsequent tests
set_and_check client "$TEST" "$FSNAME.llite.max_read_ahead_whole_mb" $i || return 3
done
# make sure client restart still works
set_and_check client "$TEST" "$FSNAME.llite.max_read_ahead_whole_mb" $i || return 3
done
# make sure client restart still works
mount_client $MOUNT || return 4
[ "$($TEST)" -ne "$i" ] && error "Param didn't stick across restart $($TEST) != $i"
pass
mount_client $MOUNT || return 4
[ "$($TEST)" -ne "$i" ] && error "Param didn't stick across restart $($TEST) != $i"
pass
touch $DIR/$tfile || return 1
stop_mds --force || return 2
touch $DIR/$tfile || return 1
stop_mds --force || return 2
- manual_umount_client --force
+ manual_umount_client --force
rc=$?
if [ $rc -ne 0 ]; then
error "mtab after failed umount - rc $rc"
rc=$?
if [ $rc -ne 0 ]; then
error "mtab after failed umount - rc $rc"
touch $DIR/$tfile || return 1
stop_ost --force || return 2
touch $DIR/$tfile || return 1
stop_ost --force || return 2
- manual_umount_client --force
+ manual_umount_client --force
rc=$?
if [ $rc -ne 0 ]; then
error "mtab after failed umount - rc $rc"
rc=$?
if [ $rc -ne 0 ]; then
error "mtab after failed umount - rc $rc"
return 1
local at_max_saved=0
return 1
local at_max_saved=0
- # adaptive timeouts may prevent seeing the issue
+ # adaptive timeouts may prevent seeing the issue
if at_is_enabled; then
at_max_saved=$(at_max_get mds)
at_max_set 0 mds client
if at_is_enabled; then
at_max_saved=$(at_max_get mds)
at_max_set 0 mds client
do_facet $SINGLEMDS "$LCTL set_param fail_loc=0x80000136" || return 2
$LCTL set_param mdc.${FSNAME}*.stats=clear
do_facet $SINGLEMDS "$LCTL set_param fail_loc=0x80000136" || return 2
$LCTL set_param mdc.${FSNAME}*.stats=clear
log "Creating a test file and stat it"
touch $MOUNT/$tdir/$tfile
stat $MOUNT/$tdir/$tfile
log "Creating a test file and stat it"
touch $MOUNT/$tdir/$tfile
stat $MOUNT/$tdir/$tfile
stop_mds -f || return 203
}
stop_mds -f || return 203
}
run_test 41b "mount mds with --nosvc and --nomgs on first mount"
run_test 41b "mount mds with --nosvc and --nomgs on first mount"
test_42() { #bug 14693
setup
check_mount || return 2
test_42() { #bug 14693
setup
check_mount || return 2
stop ost${count} -f || rc=$?
let count=count-1
done
stop ost${count} -f || rc=$?
let count=count-1
done
cleanup_nocli || rc=$?
#writeconf to remove all ost2 traces for subsequent tests
writeconf
cleanup_nocli || rc=$?
#writeconf to remove all ost2 traces for subsequent tests
writeconf
mount_client $MOUNT || return 3
trap "cleanup_46a $OSTCOUNT" EXIT ERR
mount_client $MOUNT || return 3
trap "cleanup_46a $OSTCOUNT" EXIT ERR
for (( i=2; i<=$OSTCOUNT; i++ )); do
start ost$i `ostdevname $i` $OST_MOUNT_OPTS || return $((i+2))
done
for (( i=2; i<=$OSTCOUNT; i++ )); do
start ost$i `ostdevname $i` $OST_MOUNT_OPTS || return $((i+2))
done
wait_osc_import_state mds ost DISCONN
lazystatfs $MOUNT || error "lazystatfs failed with one down server"
wait_osc_import_state mds ost DISCONN
lazystatfs $MOUNT || error "lazystatfs failed with one down server"
- umount_client $MOUNT || error "Unable to unmount client"
+ umount_client $MOUNT || error "Unable to unmount client"
stop_ost2 || error "Unable to stop OST2"
stop_mds || error "Unable to stop MDS"
#writeconf to remove all ost2 traces for subsequent tests
stop_ost2 || error "Unable to stop OST2"
stop_mds || error "Unable to stop MDS"
#writeconf to remove all ost2 traces for subsequent tests
stop_ost || error "Unable to stop OST1"
lazystatfs $MOUNT || error "lazystatfs failed with one down server"
stop_ost || error "Unable to stop OST1"
lazystatfs $MOUNT || error "lazystatfs failed with one down server"
- umount_client $MOUNT || error "Unable to unmount client"
+ umount_client $MOUNT || error "Unable to unmount client"
stop_ost2 || error "Unable to stop OST2"
stop_mds || error "Unable to stop MDS"
#writeconf to remove all ost2 traces for subsequent tests
stop_ost2 || error "Unable to stop OST2"
stop_mds || error "Unable to stop MDS"
#writeconf to remove all ost2 traces for subsequent tests