LU-7421 utils: getparam_display() should reset popt

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

diff --git a/lustre/tests/mmp.sh b/lustre/tests/mmp.sh
index 5da2d08..946a414 100755 (executable)
--- a/lustre/tests/mmp.sh
+++ b/lustre/tests/mmp.sh
@@ -141,9 +141,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 +158,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
 }
@@ -210,8 +216,15 @@ mmp_init() {
     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_OSS $MMP_OSTDEV || \
+       {
+               do_facet $MMP_OSS "$DUMPE2FS -h $MMP_OSTDEV"
+               log "Try to enable again:"
+               enable_mmp $MMP_OSS $MMP_OSTDEV
+               log "Verify again:"
+               do_facet $MMP_OSS "$DUMPE2FS -h $MMP_OSTDEV"
+               error "MMP was not enabled on $MMP_OSTDEV on $MMP_OSS"
+       }
 }
 
 # Disable the MMP feature on the Lustre server targets