LU-1842 quota: t-f changes for new quota

[fs/lustre-release.git] / lustre / tests / mmp.sh

diff --git a/lustre/tests/mmp.sh b/lustre/tests/mmp.sh
index ea80120..d939173 100755 (executable)
--- a/lustre/tests/mmp.sh
+++ b/lustre/tests/mmp.sh
@@ -106,6 +106,15 @@ disable_mmp() {
     return ${PIPESTATUS[0]}
 }
 
+# Set the MMP block to 'fsck' state
+mark_mmp_block() {
+    local facet=$1
+    local device=$2
+
+    do_facet $facet "$LUSTRE/tests/mmp_mark.sh $device"
+    return ${PIPESTATUS[0]}
+}
+
 # Reset the MMP block (if any) back to the clean state.
 reset_mmp_block() {
     local facet=$1
@@ -130,9 +139,9 @@ get_mmp_update_interval() {
     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
+    interval=$(do_facet $facet "$DEBUGFS -c -R dump_mmp $device 2>/dev/null" |
+               awk 'tolower($0) ~ /update.interval/ { print $NF }')
+    [ -z "$interval" ] && interval=5
 
     echo $interval
 }
@@ -143,13 +152,24 @@ get_mmp_check_interval() {
     local device=$2
     local interval
 
-    interval=$(do_facet $facet "$DEBUGFS -c -R dump_mmp $device 2>/dev/null \
-                | grep 'MMP Check Interval' | cut -d' ' -f4")
+    interval=$(do_facet $facet "$DEBUGFS -c -R dump_mmp $device 2>/dev/null" |
+               awk 'tolower($0) ~ /check.interval/ { print $NF }')
     [ -z "$interval" ] && interval=5
 
     echo $interval
 }
 
+# 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}
+
+    do_facet $facet "$TUNE2FS -E mmp_update_interval=$interval $device"
+    return ${PIPESTATUS[0]}
+}
+
 # Enable the MMP feature on the Lustre server targets.
 mmp_init() {
     init_vars
@@ -185,7 +205,8 @@ mmp_init() {
 # which did not use failover.
 mmp_fini() {
 
-    if [ -z "$mdsfailover_HOST" ]; then
+    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"
@@ -193,7 +214,8 @@ mmp_fini() {
             error "MMP was not disabled on $MMP_MDSDEV on $MMP_MDS"
     fi
 
-    if [ -z "$ostfailover_HOST" ]; then
+    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"
@@ -204,7 +226,7 @@ mmp_fini() {
     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
@@ -243,7 +265,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
 
@@ -269,7 +291,7 @@ 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
@@ -311,7 +333,7 @@ mount_during_unmount() {
     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
@@ -325,7 +347,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]}
@@ -375,7 +397,7 @@ run_e2fsck() {
     shift
     local opts="$@"
 
-    log "Running e2fsck on the device $device on $facet..."
+    echo "Running e2fsck on the device $device on $facet..."
     do_facet $facet "$E2FSCK $opts $device"
     return ${PIPESTATUS[0]}
 }
@@ -506,43 +528,57 @@ run_test 7 "mount after reboot"
 # Test 8 - mount during e2fsck (should never succeed).
 test_8() {
     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 1
+    sleep 5
 
-    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"
+        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 1
+    sleep 5
 
-    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"
+        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"
 
 # Test 9 - mount after aborted e2fsck (should never succeed).
 test_9() {
-    local e2fsck_pid
-    local mdt_mmp_check_interval
-    local ost_mmp_check_interval
-
     start $MMP_MDS $MMP_MDSDEV $MDS_MOUNT_OPTS || return ${PIPESTATUS[0]}
     if ! start $MMP_OSS $MMP_OSTDEV $OST_MOUNT_OPTS; then
         local rc=${PIPESTATUS[0]}
@@ -551,11 +587,7 @@ test_9() {
     fi
     stop_services primary || return ${PIPESTATUS[0]}
 
-    mdt_mmp_check_interval=$(get_mmp_check_interval $MMP_MDS $MMP_MDSDEV)
-    run_e2fsck $MMP_MDS_FAILOVER $MMP_MDSDEV "-fy" &
-    e2fsck_pid=$!
-    sleep $((2 * $mdt_mmp_check_interval + 1))
-    kill -s ABRT $e2fsck_pid
+    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
@@ -566,12 +598,7 @@ test_9() {
 
     reset_mmp_block $MMP_MDS $MMP_MDSDEV || return ${PIPESTATUS[0]}
 
-    echo
-    ost_mmp_check_interval=$(get_mmp_check_interval $MMP_OSS $MMP_OSTDEV)
-    run_e2fsck $MMP_OSS_FAILOVER $MMP_OSTDEV "-fy" &
-    e2fsck_pid=$!
-    sleep $((2 * $ost_mmp_check_interval + 1))
-    kill -s ABRT $e2fsck_pid
+    mark_mmp_block $MMP_OSS $MMP_OSTDEV || return ${PIPESTATUS[0]}
 
     log "Mounting $MMP_OSTDEV on $MMP_OSS..."
     if start $MMP_OSS $MMP_OSTDEV $OST_MOUNT_OPTS; then
@@ -594,10 +621,14 @@ test_10() {
 
     run_e2fsck $MMP_MDS_FAILOVER $MMP_MDSDEV "-fn"
     rc=${PIPESTATUS[0]}
-    if [ $rc -ne 8 ]; then
-        error_noexit "e2fsck $MMP_MDSDEV on $MMP_MDS_FAILOVER should return 8"
+
+    # e2fsck is called with -n option (Open the filesystem read-only), so
+    # 0 (No errors) and 4 (File system errors left uncorrected) are the only
+    # acceptable exit codes in this case
+    if [ $rc -ne 0 ] && [ $rc -ne 4 ]; then
+        error_noexit "e2fsck $MMP_MDSDEV on $MMP_MDS_FAILOVER returned $rc"
         stop $MMP_MDS || return ${PIPESTATUS[0]}
-        [ $rc -ne 0 ] && return $rc || return 1
+        return $rc
     fi
 
     log "Mounting $MMP_OSTDEV on $MMP_OSS..."
@@ -610,10 +641,8 @@ test_10() {
 
     run_e2fsck $MMP_OSS_FAILOVER $MMP_OSTDEV "-fn"
     rc=${PIPESTATUS[0]}
-    if [ $rc -ne 8 ]; then
-        error_noexit "e2fsck $MMP_OSTDEV on $MMP_OSS_FAILOVER should return 8"
-        stop_services primary || return ${PIPESTATUS[0]}
-        [ $rc -ne 0 ] && return $rc || return 1
+    if [ $rc -ne 0 ] && [ $rc -ne 4 ]; then
+        error_noexit "e2fsck $MMP_OSTDEV on $MMP_OSS_FAILOVER returned $rc"
     fi
 
     stop_services primary || return ${PIPESTATUS[0]}
@@ -624,8 +653,6 @@ run_test 10 "e2fsck with mounted filesystem"
 mmp_fini
 FAIL_ON_ERROR=$SAVED_FAIL_ON_ERROR
 
-equals_msg $(basename $0): test complete
+complete $(basename $0) $SECONDS
 $MMP_RESTORE_MOUNT && setupall
-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && \
-    grep -q FAIL $TESTSUITELOG && exit 1 || true
-echo "$0: completed"
+exit_status