X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmmp.sh;h=1db6ff49e14f1470a45ed84034ecd636495a7ea4;hb=1155c2fee4c197bfc295f761d52f9b748c37ad79;hp=074a20c1eb5089b51b80fe5c098dcb4f7adea956;hpb=6f57184f83dc983eded15052d434e7856a7de92e;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mmp.sh b/lustre/tests/mmp.sh
index 074a20c..1db6ff4 100755
--- a/lustre/tests/mmp.sh
+++ b/lustre/tests/mmp.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
 #
 # Tests for multiple mount protection (MMP) feature.
 #
@@ -11,36 +10,30 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 
-# bug number for skipped test:
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"$MMP_EXCEPT"}
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
-
-SRCDIR=$(cd $(dirname $0); echo $PWD)
-export PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH:/sbin
-
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
-remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
-[ "$MDSFSTYPE" != "ldiskfs" ] && skip "MDS not running ldiskfs" && exit 0
-[ "$OSTFSTYPE" != "ldiskfs" ] && skip "OST not running ldiskfs" && exit 0
+# bug number for skipped test:
+ALWAYS_EXCEPT=$MMP_EXCEPT
+# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
+
+build_test_filter
+
+remote_mds_nodsh && skip "remote MDS with nodsh"
+remote_ost_nodsh && skip "remote OST with nodsh"
 
 # unmount and cleanup the Lustre filesystem
 MMP_RESTORE_MOUNT=false
 if is_mounted $MOUNT || is_mounted $MOUNT2; then
-    cleanupall
-    MMP_RESTORE_MOUNT=true
+	cleanupall
+	MMP_RESTORE_MOUNT=true
 fi
 
 SAVED_FAIL_ON_ERROR=$FAIL_ON_ERROR
 FAIL_ON_ERROR=false
 
-build_test_filter
-
 # Get the failover facet.
 get_failover_facet() {
     local facet=$1
@@ -137,87 +130,111 @@ mmp_is_enabled() {
 
 # Get MMP update interval (in seconds) from the Lustre server target.
 get_mmp_update_interval() {
-    local facet=$1
-    local device=$2
-    local interval
-
-    interval=$(do_facet $facet "$DEBUGFS -c -R dump_mmp $device 2>/dev/null \
-                | grep 'MMP Update Interval' | cut -d' ' -f4")
-    [ -z "$interval" ] && interval=1
-
-    echo $interval
+	local facet=$1
+	local device=$2
+	local interval
+
+	interval=$(do_facet $facet \
+		   "$DEBUGFS -c -R dump_mmp $device 2>$TMP/mmp.debugfs.msg" |
+		   awk 'tolower($0) ~ /update.interval/ { print $NF }')
+	[ -z "$interval" ] && interval=5 &&
+		do_facet $facet cat $TMP/mmp.debugfs.msg &&
+		echo "$facet:$device: assume update interval=$interval" 1>&2 ||
+		echo "$facet:$device: got actual update interval=$interval" 1>&2
+
+	echo $interval
 }
 
 # Get MMP check interval (in seconds) from the Lustre server target.
 get_mmp_check_interval() {
-    local facet=$1
-    local device=$2
-    local interval
+	local facet=$1
+	local device=$2
+	local interval
+
+	interval=$(do_facet $facet \
+		   "$DEBUGFS -c -R dump_mmp $device 2>$TMP/mmp.debugfs.msg" |
+		   awk 'tolower($0) ~ /check.interval/ { print $NF }')
+	[ -z "$interval" ] && interval=5 &&
+		do_facet $facet cat $TMP/mmp.debugfs.msg &&
+		echo "$facet:$device: assume check interval=$interval" 1>&2 ||
+		echo "$facet:$device: got actual check interval=$interval" 1>&2
+
+	echo $interval
+}
 
-    interval=$(do_facet $facet "$DEBUGFS -c -R dump_mmp $device 2>/dev/null \
-                | grep 'MMP Check Interval' | cut -d' ' -f4")
-    [ -z "$interval" ] && interval=5
+# Adjust the MMP update interval (in seconds) on the Lustre server target.
+# Specifying an interval of 0 means to use the default interval.
+set_mmp_update_interval() {
+	local facet=$1
+	local device=$2
+	local interval=${3:-0}
 
-    echo $interval
+	do_facet $facet "$TUNE2FS -E mmp_update_interval=$interval $device"
+	return ${PIPESTATUS[0]}
 }
 
+I_ENABLED_MDS=0
+I_ENABLED_OSS=0
+
 # Enable the MMP feature on the Lustre server targets.
 mmp_init() {
-    init_vars
-
-    # The MMP feature is automatically enabled by mkfs.lustre for
-    # new file system at format time if failover is being used.
-    # Otherwise, the Lustre administrator has to manually enable
-    # this feature when the file system is unmounted.
-
-    local var=${MMP_MDS}failover_HOST
-    if [ -z "${!var}" ]; then
-        log "Failover is not used on MDS, enabling MMP manually..."
-        enable_mmp $MMP_MDS $MMP_MDSDEV || \
-            error "failed to enable MMP on $MMP_MDSDEV on $MMP_MDS"
-    fi
-
-    var=${MMP_OSS}failover_HOST
-    if [ -z "${!var}" ]; then
-        log "Failover is not used on OSS, enabling MMP manually..."
-        enable_mmp $MMP_OSS $MMP_OSTDEV || \
-            error "failed to enable MMP on $MMP_OSTDEV on $MMP_OSS"
-    fi
-
-    # check whether the MMP feature is enabled or not
-    mmp_is_enabled $MMP_MDS $MMP_MDSDEV || \
-        error "MMP was not enabled on $MMP_MDSDEV on $MMP_MDS"
-
-    mmp_is_enabled $MMP_OSS $MMP_OSTDEV || \
-        error "MMP was not enabled on $MMP_OSTDEV on $MMP_OSS"
+	init_vars
+
+	if [ $(facet_fstype $MMP_MDS) != ldiskfs ]; then
+		skip_env "ldiskfs only test"
+	fi
+
+	if [ $(facet_fstype $MMP_OSS) != ldiskfs ]; then
+		skip_env "ldiskfs only test"
+	fi
+
+	mmp_is_enabled $MMP_MDS $MMP_MDSDEV ||
+	{
+		log "MMP is not enabled on MDS, enabling it manually..."
+		enable_mmp $MMP_MDS $MMP_MDSDEV ||
+			error "failed to enable MMP on $MMP_MDSDEV on $MMP_MDS"
+		I_ENABLED_MDS=1
+	}
+
+	mmp_is_enabled $MMP_OSS $MMP_OSTDEV ||
+	{
+		log "MMP is not enabled on OSS, enabling it manually..."
+		enable_mmp $MMP_OSS $MMP_OSTDEV ||
+			error "failed to enable MMP on $MMP_OSTDEV on $MMP_OSS"
+		I_ENABLED_OSS=1
+	}
+
+	# check whether the MMP feature is enabled or not
+	mmp_is_enabled $MMP_MDS $MMP_MDSDEV ||
+		error "MMP was not enabled on $MMP_MDSDEV on $MMP_MDS"
+
+	mmp_is_enabled $MMP_OSS $MMP_OSTDEV ||
+		error "MMP was not enabled on $MMP_OSTDEV on $MMP_OSS"
 }
 
 # Disable the MMP feature on the Lustre server targets
-# which did not use failover.
 mmp_fini() {
 
-    local var=${MMP_MDS}failover_HOST
-    if [ -z "${!var}" ]; then
-        log "Failover is not used on MDS, disabling MMP manually..."
-        disable_mmp $MMP_MDS $MMP_MDSDEV || \
-            error "failed to disable MMP on $MMP_MDSDEV on $MMP_MDS"
-        mmp_is_enabled $MMP_MDS $MMP_MDSDEV && \
-            error "MMP was not disabled on $MMP_MDSDEV on $MMP_MDS"
-    fi
-
-    var=${MMP_OSS}failover_HOST
-    if [ -z "${!var}" ]; then
-        log "Failover is not used on OSS, disabling MMP manually..."
-        disable_mmp $MMP_OSS $MMP_OSTDEV || \
-            error "failed to disable MMP on $MMP_OSTDEV on $MMP_OSS"
-        mmp_is_enabled $MMP_OSS $MMP_OSTDEV && \
-            error "MMP was not disabled on $MMP_OSTDEV on $MMP_OSS"
-    fi
-
-    return 0
+	if [ $I_ENABLED_MDS -eq 1 ]; then
+		log "Disabling MMP on $MMP_MDSDEV on $MMP_MDS manually..."
+		disable_mmp $MMP_MDS $MMP_MDSDEV ||
+			error "failed to disable MMP on $MMP_MDSDEV on $MMP_MDS"
+		mmp_is_enabled $MMP_MDS $MMP_MDSDEV &&
+			error "MMP was not disabled on $MMP_MDSDEV on $MMP_MDS"
+	fi
+
+	if [ $I_ENABLED_OSS -eq 1 ]; then
+		log "Disabling MMP on $MMP_OSTDEV on $MMP_OSS manually..."
+		disable_mmp $MMP_OSS $MMP_OSTDEV ||
+			error "failed to disable MMP on $MMP_OSTDEV on $MMP_OSS"
+		mmp_is_enabled $MMP_OSS $MMP_OSTDEV &&
+			error "MMP was not disabled on $MMP_OSTDEV on $MMP_OSS"
+	fi
+
+	return 0
 }
 
-# Mount the shared target on the failover server after some interval it's 
+# Mount the shared target on the failover server after some interval it's
 # mounted on the primary server.
 mount_after_interval_sub() {
     local interval=$1
@@ -256,7 +273,7 @@ mount_after_interval_sub() {
             return ${PIPESTATUS[0]}
         return 1
     elif [ $second_mount_rc -ne 0 -a $first_mount_rc -ne 0 ]; then
-        error_noexit "failed to mount on the failover pair $facet,$failover_facet"
+	error_noexit "mount failure on failover pair $facet,$failover_facet"
         return $first_mount_rc
     fi
 
@@ -282,49 +299,56 @@ mount_after_interval() {
     return 0
 }
 
-# Mount the shared target on the failover server 
+# Mount the shared target on the failover server
 # during unmounting it on the primary server.
 mount_during_unmount() {
-    local device=$1
-    shift
-    local facet=$1
-    shift
-    local mnt_opts="$@"
-    local failover_facet=$(get_failover_facet $facet)
-
-    local unmount_pid
-    local unmount_rc=0
-    local mount_rc=0
-
-    log "Mounting $device on $facet..."
-    start $facet $device $mnt_opts || return ${PIPESTATUS[0]}
-
-    log "Unmounting $device on $facet..."
-    stop $facet &
-    unmount_pid=$!
-
-    log "Mounting $device on $failover_facet..."
-    start $failover_facet $device $mnt_opts
-    mount_rc=${PIPESTATUS[0]}
-
-    wait $unmount_pid
-    unmount_rc=${PIPESTATUS[0]}
-
-    if [ $mount_rc -eq 0 ]; then
-        error_noexit "mount during unmount of the first filesystem should fail"
-        stop $failover_facet || return ${PIPESTATUS[0]}
-        return 1
-    fi
-
-    if [ $unmount_rc -ne 0 ]; then
-        error_noexit "unmount the $device on $facet should succeed"
-        return $unmount_rc
-    fi
-
-    return 0
+	local device=$1
+	shift
+	local facet=$1
+	shift
+	local mnt_opts="$@"
+	local failover_facet=$(get_failover_facet $facet)
+
+	local unmount_pid
+	local unmount_rc=0
+	local mount_rc=0
+
+	log "Mounting $device on $facet..."
+	start $facet $device $mnt_opts || return ${PIPESTATUS[0]}
+
+	log "Unmounting $device on $facet..."
+	stop $facet &
+	unmount_pid=$!
+
+	log "Mounting $device on $failover_facet..."
+	start $failover_facet $device $mnt_opts
+	mount_rc=${PIPESTATUS[0]}
+
+	# check whether the first filesystem is still mounted
+	local mntpt=$(facet_mntpt $facet)
+	local mounted=$(do_facet $facet "grep -w $mntpt /proc/mounts")
+
+	wait $unmount_pid
+	unmount_rc=${PIPESTATUS[0]}
+
+	if [ $mount_rc -eq 0 ]; then
+		stop $failover_facet || return ${PIPESTATUS[0]}
+
+		if [ -n "$mounted" ]; then
+			error_noexit "mount during unmount of first filesystem worked"
+			return 1
+		fi
+	fi
+
+	if [ $unmount_rc -ne 0 ]; then
+		error_noexit "unmount the $device on $facet should succeed"
+		return $unmount_rc
+	fi
+
+	return 0
 }
 
-# Mount the shared target on the failover server 
+# Mount the shared target on the failover server
 # after clean unmounting it on the primary server.
 mount_after_unmount() {
     local device=$1
@@ -338,7 +362,7 @@ mount_after_unmount() {
     start $facet $device $mnt_opts || return ${PIPESTATUS[0]}
 
     log "Unmounting $device on $facet..."
-    stop $facet || return ${PIPESTATUS[0]} 
+    stop $facet || return ${PIPESTATUS[0]}
 
     log "Mounting $device on $failover_facet..."
     start $failover_facet $device $mnt_opts || return ${PIPESTATUS[0]}
@@ -382,171 +406,190 @@ mount_after_reboot() {
 
 # Run e2fsck on the Lustre server target.
 run_e2fsck() {
-    local facet=$1
-    shift
-    local device=$1
-    shift
-    local opts="$@"
-
-    log "Running e2fsck on the device $device on $facet..."
-    do_facet $facet "$E2FSCK $opts $device"
-    return ${PIPESTATUS[0]}
+	local facet=$1
+	shift
+	local device=$1
+	shift
+	local opts="$@"
+
+	echo "Running e2fsck on the device $device on $facet..."
+	do_facet $facet "$E2FSCK $opts $device"
+	return ${PIPESTATUS[0]}
 }
 
 # Check whether there are failover pairs for MDS and OSS servers.
 check_failover_pair() {
-    [ "$MMP_MDS" = "$MMP_MDS_FAILOVER" -o "$MMP_OSS" = "$MMP_OSS_FAILOVER" ] \
-        && { skip_env "failover pair is needed" && return 1; }
-    return 0
+	[ "$MMP_MDS" = "$MMP_MDS_FAILOVER" -o "$MMP_OSS" = "$MMP_OSS_FAILOVER" ] &&
+		skip_env "failover pair is needed"
+	return 0
 }
 
 mmp_init
 
 # Test 1 - two mounts at the same time.
 test_1() {
-    check_failover_pair || return 0
+	check_failover_pair
 
-    mount_after_interval 0 0 || return ${PIPESTATUS[0]}
-    stop_services primary || return ${PIPESTATUS[0]}
+	mount_after_interval 0 0 || return ${PIPESTATUS[0]}
+	stop_services primary || return ${PIPESTATUS[0]}
+	stop_services failover || return ${PIPESTATUS[0]}
 }
 run_test 1 "two mounts at the same time"
 
 # Test 2 - one mount delayed by mmp update interval.
 test_2() {
-    check_failover_pair || return 0
+	check_failover_pair
 
-    local mdt_interval=$(get_mmp_update_interval $MMP_MDS $MMP_MDSDEV)
-    local ost_interval=$(get_mmp_update_interval $MMP_OSS $MMP_OSTDEV)
+	local mdt_interval=$(get_mmp_update_interval $MMP_MDS $MMP_MDSDEV)
+	local ost_interval=$(get_mmp_update_interval $MMP_OSS $MMP_OSTDEV)
 
-    mount_after_interval $mdt_interval $ost_interval || return ${PIPESTATUS[0]}
-    stop_services primary || return ${PIPESTATUS[0]}
+	mount_after_interval $mdt_interval $ost_interval ||
+		return ${PIPESTATUS[0]}
+	stop_services primary || return ${PIPESTATUS[0]}
 }
 run_test 2 "one mount delayed by mmp update interval"
 
 # Test 3 - one mount delayed by 2x mmp check interval.
 test_3() {
-    check_failover_pair || return 0
+	check_failover_pair
 
-    local mdt_interval=$(get_mmp_check_interval $MMP_MDS $MMP_MDSDEV)
-    local ost_interval=$(get_mmp_check_interval $MMP_OSS $MMP_OSTDEV)
+	local mdt_interval=$(get_mmp_check_interval $MMP_MDS $MMP_MDSDEV)
+	local ost_interval=$(get_mmp_check_interval $MMP_OSS $MMP_OSTDEV)
 
-    mdt_interval=$((2 * $mdt_interval + 1))
-    ost_interval=$((2 * $ost_interval + 1))
+	mdt_interval=$((2 * $mdt_interval + 1))
+	ost_interval=$((2 * $ost_interval + 1))
 
-    mount_after_interval $mdt_interval $ost_interval || return ${PIPESTATUS[0]}
-    stop_services primary || return ${PIPESTATUS[0]}
+	mount_after_interval $mdt_interval $ost_interval ||
+		return ${PIPESTATUS[0]}
+	stop_services primary || return ${PIPESTATUS[0]}
 }
 run_test 3 "one mount delayed by 2x mmp check interval"
 
 # Test 4 - one mount delayed by > 2x mmp check interval.
 test_4() {
-    check_failover_pair || return 0
+	check_failover_pair
 
-    local mdt_interval=$(get_mmp_check_interval $MMP_MDS $MMP_MDSDEV)
-    local ost_interval=$(get_mmp_check_interval $MMP_OSS $MMP_OSTDEV)
+	local mdt_interval=$(get_mmp_check_interval $MMP_MDS $MMP_MDSDEV)
+	local ost_interval=$(get_mmp_check_interval $MMP_OSS $MMP_OSTDEV)
 
-    mdt_interval=$((4 * $mdt_interval))
-    ost_interval=$((4 * $ost_interval))
+	mdt_interval=$((4 * $mdt_interval))
+	ost_interval=$((4 * $ost_interval))
 
-    mount_after_interval $mdt_interval $ost_interval || return ${PIPESTATUS[0]}
-    stop_services primary || return ${PIPESTATUS[0]}
+	mount_after_interval $mdt_interval $ost_interval ||
+		return ${PIPESTATUS[0]}
+	stop_services primary || return ${PIPESTATUS[0]}
 }
 run_test 4 "one mount delayed by > 2x mmp check interval"
 
 # Test 5 - mount during unmount of the first filesystem.
 test_5() {
-    local rc=0
-    check_failover_pair || return 0
-
-    mount_during_unmount $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS || \
-        return ${PIPESTATUS[0]}
-
-    echo
-    start $MMP_MDS $MMP_MDSDEV $MDS_MOUNT_OPTS || return ${PIPESTATUS[0]}
-    mount_during_unmount $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
-    rc=${PIPESTATUS[0]}
-    if [ $rc -ne 0 ]; then
-        stop $MMP_MDS || return ${PIPESTATUS[0]}
-        return $rc
-    fi
-
-    stop $MMP_MDS || return ${PIPESTATUS[0]}
+	local rc=0
+	check_failover_pair
+
+	mount_during_unmount $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS ||
+		return ${PIPESTATUS[0]}
+
+	echo
+	start $MMP_MDS $MMP_MDSDEV $MDS_MOUNT_OPTS || return ${PIPESTATUS[0]}
+	mount_during_unmount $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
+	rc=${PIPESTATUS[0]}
+	stop $MMP_MDS || return ${PIPESTATUS[0]}
+	return $rc
 }
 run_test 5 "mount during unmount of the first filesystem"
 
 # Test 6 - mount after clean unmount.
 test_6() {
-    local rc=0
-    check_failover_pair || return 0
+	local rc=0
+	check_failover_pair
 
-    mount_after_unmount $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS || \
-        return ${PIPESTATUS[0]}
+	mount_after_unmount $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS ||
+		return ${PIPESTATUS[0]}
 
-    echo
-    mount_after_unmount $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
-    rc=${PIPESTATUS[0]}
-    if [ $rc -ne 0 ]; then
-        stop $MMP_MDS_FAILOVER || return ${PIPESTATUS[0]}
-        return $rc
-    fi
+	echo
+	mount_after_unmount $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
+	rc=${PIPESTATUS[0]}
+	if [ $rc -ne 0 ]; then
+		stop $MMP_MDS_FAILOVER || return ${PIPESTATUS[0]}
+		return $rc
+	fi
 
-    stop_services failover || return ${PIPESTATUS[0]}
+	stop_services failover || return ${PIPESTATUS[0]}
 }
 run_test 6 "mount after clean unmount"
 
 # Test 7 - mount after reboot.
 test_7() {
-    local rc=0
-    check_failover_pair || return 0
-
-    mount_after_reboot $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS || \
-        return ${PIPESTATUS[0]}
-
-    echo
-    mount_after_reboot $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
-    rc=${PIPESTATUS[0]}
-    if [ $rc -ne 0 ]; then
-        stop $MMP_MDS || return ${PIPESTATUS[0]}
-        stop $MMP_MDS_FAILOVER || return ${PIPESTATUS[0]}
-        return $rc
-    fi
-
-    stop_services failover || return ${PIPESTATUS[0]}
-    stop_services primary || return ${PIPESTATUS[0]}
+	local rc=0
+	check_failover_pair
+
+	mount_after_reboot $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS ||
+		return ${PIPESTATUS[0]}
+
+	echo
+	mount_after_reboot $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
+	rc=${PIPESTATUS[0]}
+	if [ $rc -ne 0 ]; then
+		stop $MMP_MDS || return ${PIPESTATUS[0]}
+		stop $MMP_MDS_FAILOVER || return ${PIPESTATUS[0]}
+		return $rc
+	fi
+
+	stop_services failover || return ${PIPESTATUS[0]}
+	stop_services primary || return ${PIPESTATUS[0]}
 }
 run_test 7 "mount after reboot"
 
 # Test 8 - mount during e2fsck (should never succeed).
 test_8() {
-    local e2fsck_pid
-
-    run_e2fsck $MMP_MDS $MMP_MDSDEV "-fy" &
-    e2fsck_pid=$!
-    sleep 1
-
-    log "Mounting $MMP_MDSDEV on $MMP_MDS_FAILOVER..."
-    if start $MMP_MDS_FAILOVER $MMP_MDSDEV $MDS_MOUNT_OPTS; then
-        error_noexit "mount $MMP_MDSDEV on $MMP_MDS_FAILOVER should fail"
-        stop $MMP_MDS_FAILOVER || return ${PIPESTATUS[0]}
-        return 1
-    fi
-
-    wait $e2fsck_pid
-
-    echo
-    run_e2fsck $MMP_OSS $MMP_OSTDEV "-fy" &
-    e2fsck_pid=$!
-    sleep 1
-
-    log "Mounting $MMP_OSTDEV on $MMP_OSS_FAILOVER..."
-    if start $MMP_OSS_FAILOVER $MMP_OSTDEV $OST_MOUNT_OPTS; then
-        error_noexit "mount $MMP_OSTDEV on $MMP_OSS_FAILOVER should fail"
-        stop $MMP_OSS_FAILOVER || return ${PIPESTATUS[0]}
-        return 2
-    fi
-
-    wait $e2fsck_pid
-    return 0
+	local e2fsck_pid
+	local saved_interval
+	local new_interval
+
+	# After writing a new sequence number into the MMP block, e2fsck will
+	# sleep at least (2 * new_interval + 1) seconds before it goes into
+	# e2fsck passes.
+	new_interval=30
+
+	# MDT
+	saved_interval=$(get_mmp_update_interval $MMP_MDS $MMP_MDSDEV)
+	set_mmp_update_interval $MMP_MDS $MMP_MDSDEV $new_interval
+
+	run_e2fsck $MMP_MDS $MMP_MDSDEV "-fy" &
+	e2fsck_pid=$!
+	sleep 5
+
+	if start $MMP_MDS_FAILOVER $MMP_MDSDEV $MDS_MOUNT_OPTS; then
+		error_noexit \
+			"mount $MMP_MDSDEV on $MMP_MDS_FAILOVER should fail"
+		stop $MMP_MDS_FAILOVER || return ${PIPESTATUS[0]}
+		set_mmp_update_interval $MMP_MDS $MMP_MDSDEV $saved_interval
+		return 1
+	fi
+
+	wait $e2fsck_pid
+	set_mmp_update_interval $MMP_MDS $MMP_MDSDEV $saved_interval
+
+	# OST
+	echo
+	saved_interval=$(get_mmp_update_interval $MMP_OSS $MMP_OSTDEV)
+	set_mmp_update_interval $MMP_OSS $MMP_OSTDEV $new_interval
+
+	run_e2fsck $MMP_OSS $MMP_OSTDEV "-fy" &
+	e2fsck_pid=$!
+	sleep 5
+
+	if start $MMP_OSS_FAILOVER $MMP_OSTDEV $OST_MOUNT_OPTS; then
+		error_noexit \
+			"mount $MMP_OSTDEV on $MMP_OSS_FAILOVER should fail"
+		stop $MMP_OSS_FAILOVER || return ${PIPESTATUS[0]}
+		set_mmp_update_interval $MMP_OSS $MMP_OSTDEV $saved_interval
+		return 2
+	fi
+
+	wait $e2fsck_pid
+	set_mmp_update_interval $MMP_OSS $MMP_OSTDEV $saved_interval
+	return 0
 }
 run_test 8 "mount during e2fsck"
 
@@ -561,7 +604,7 @@ test_9() {
     stop_services primary || return ${PIPESTATUS[0]}
 
     mark_mmp_block $MMP_MDS $MMP_MDSDEV || return ${PIPESTATUS[0]}
-    
+
     log "Mounting $MMP_MDSDEV on $MMP_MDS..."
     if start $MMP_MDS $MMP_MDSDEV $MDS_MOUNT_OPTS; then
         error_noexit "mount $MMP_MDSDEV on $MMP_MDS should fail"
@@ -618,7 +661,7 @@ test_10() {
         error_noexit "e2fsck $MMP_OSTDEV on $MMP_OSS_FAILOVER returned $rc"
     fi
 
-    stop_services primary || return ${PIPESTATUS[0]}
+    CLEANUP_DM_DEV=true stop_services primary || return ${PIPESTATUS[0]}
     return 0
 }
 run_test 10 "e2fsck with mounted filesystem"
@@ -626,6 +669,7 @@ run_test 10 "e2fsck with mounted filesystem"
 mmp_fini
 FAIL_ON_ERROR=$SAVED_FAIL_ON_ERROR
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 $MMP_RESTORE_MOUNT && setupall
+check_and_cleanup_lustre
 exit_status