X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmmp.sh;h=d3b563225ffcf3fd9fc56be45382d597d53845ce;hb=99d7a8ed43be126b2769ad8bb0b5350cd328ed7f;hp=5da2d08d961d68bcf1dd085603921112eed3ff3b;hpb=dee5f24114531ec34fc56ce2826ada9e5690aabc;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mmp.sh b/lustre/tests/mmp.sh
index 5da2d08..d3b5632 100755
--- a/lustre/tests/mmp.sh
+++ b/lustre/tests/mmp.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
-# vim:shiftwidth=4:softtabstop=4:tabstop=4:
 #
 # Tests for multiple mount protection (MMP) feature.
 #
@@ -25,14 +23,14 @@ 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
+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
@@ -141,9 +139,12 @@ get_mmp_update_interval() {
 	local interval
 
 	interval=$(do_facet $facet \
-		   "$DEBUGFS -c -R dump_mmp $device 2>/dev/null" |
+		   "$DEBUGFS -c -R dump_mmp $device 2>$TMP/mmp.debugfs.msg" |
 		   awk 'tolower($0) ~ /update.interval/ { print $NF }')
-	[ -z "$interval" ] && interval=5
+	[ -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
 }
@@ -155,9 +156,12 @@ get_mmp_check_interval() {
 	local interval
 
 	interval=$(do_facet $facet \
-		   "$DEBUGFS -c -R dump_mmp $device 2>/dev/null" |
+		   "$DEBUGFS -c -R dump_mmp $device 2>$TMP/mmp.debugfs.msg" |
 		   awk 'tolower($0) ~ /check.interval/ { print $NF }')
-	[ -z "$interval" ] && interval=5
+	[ -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
 }
@@ -173,70 +177,65 @@ set_mmp_update_interval() {
 	return ${PIPESTATUS[0]}
 }
 
+I_ENABLED_MDS=0
+I_ENABLED_OSS=0
+
 # Enable the MMP feature on the Lustre server targets.
 mmp_init() {
 	init_vars
 
 	if [ $(facet_fstype $MMP_MDS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
-		exit
+		skip_env "ldiskfs only test"
 	fi
 
 	if [ $(facet_fstype $MMP_OSS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based OSTs"
-		exit
+		skip_env "ldiskfs only test"
 	fi
 
-    # 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"
+	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
+	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
 
-    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
+	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
+	return 0
 }
 
 # Mount the shared target on the failover server after some interval it's
@@ -307,43 +306,50 @@ mount_after_interval() {
 # 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 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
+	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 "Mounting $device on $facet..."
+	start $facet $device $mnt_opts || return ${PIPESTATUS[0]}
 
-    log "Unmounting $device on $facet..."
-    stop $facet &
-    unmount_pid=$!
+	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]}
+	log "Mounting $device on $failover_facet..."
+	start $failover_facet $device $mnt_opts
+	mount_rc=${PIPESTATUS[0]}
 
-    wait $unmount_pid
-    unmount_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")
 
-    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
+	wait $unmount_pid
+	unmount_rc=${PIPESTATUS[0]}
 
-    if [ $unmount_rc -ne 0 ]; then
-        error_noexit "unmount the $device on $facet should succeed"
-        return $unmount_rc
-    fi
+	if [ $mount_rc -eq 0 ]; then
+		stop $failover_facet || return ${PIPESTATUS[0]}
 
-    return 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
@@ -417,124 +423,124 @@ run_e2fsck() {
 
 # 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
+	local rc=0
+	check_failover_pair
 
-    mount_during_unmount $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS || \
-        return ${PIPESTATUS[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]}
+	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
+	local rc=0
+	check_failover_pair
 
-    mount_after_reboot $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS || \
-        return ${PIPESTATUS[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
+	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]}
+	stop_services failover || return ${PIPESTATUS[0]}
+	stop_services primary || return ${PIPESTATUS[0]}
 }
 run_test 7 "mount after reboot"
 
@@ -659,7 +665,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"
@@ -669,4 +675,5 @@ FAIL_ON_ERROR=$SAVED_FAIL_ON_ERROR
 
 complete $SECONDS
 $MMP_RESTORE_MOUNT && setupall
+check_and_cleanup_lustre
 exit_status