LU-11750 krb5: krb5int_derive_key has 'hash' extra parameter

[fs/lustre-release.git] / lustre / scripts / lustre

diff --git a/lustre/scripts/lustre b/lustre/scripts/lustre
index baa0430..919efb0 100644 (file)
--- a/lustre/scripts/lustre
+++ b/lustre/scripts/lustre
@@ -319,7 +319,7 @@ device_is_active ()
 }
 
 # Usage: mount_one_device <label> <successflag> [devtype]
-# Remove <succesflag> on error (trick to detect errors after parallel runs).
+# Remove <successflag> on error (trick to detect errors after parallel runs).
 mount_one_device ()
 {
        local label=$1
@@ -595,6 +595,7 @@ stop_lustre_services ()
 # General lustre health check - not device specific.
 health_check ()
 {
+
        old_nullglob="`shopt -p nullglob`"
        shopt -u nullglob
 
@@ -617,29 +618,32 @@ health_check ()
                fi
 
                # check for either a server or a client filesystem
-               MDT=""
-               OST=""
-               LLITE=""
+               local MGT=""
+               local MDT=""
+               local OST=""
+               local LLITE=""
+
+               ! lctl get_param -n mgs.MGS.* >/dev/null 2>&1 || MGT="YES"
 
-               VAR=$(lctl get_param -n mdt.*.recovery_status 2>&1)
+               VAR=$(lctl get_param -n mdt.*.recovery_status 2>&1 | grep '^status:'  )
                if [ $? = 0 ] ; then
-                       MDT="YES"
+                       MDT=$VAR
                fi
 
-               VAR=$(lctl get_param -n obdfilter.*.recovery_status 2>&1)
+               VAR=$(lctl get_param -n obdfilter.*.recovery_status 2>&1 | grep '^status:')
                if [ $? = 0 ] ; then
-                        OST="YES"
-                fi
+                       OST=$VAR
+               fi
 
-                VAR=$(lctl get_param -n llite.fs* 2>&1)
+               VAR=$(lctl get_param -n llite.fs* 2>&1)
                if [ $? = 0 ] ; then
-                        LLITE="YES"
-                fi
+                       LLITE="YES"
+               fi
 
-                if [ "$MDT" -o "$OST" -o "$LLITE" ]; then
-                        STATE="running"
-                        RETVAL=0
-                fi
+               if [ "$MGT" -o "$MDT" -o "$OST" -o "$LLITE" ]; then
+                       STATE="running"
+                       RETVAL=0
+               fi
        else
                # check if this is a router
                if [[ "$(lctl get_param -n routes)" =~ "Routing enabled" ]]; then
@@ -649,7 +653,7 @@ health_check ()
        fi
 
        # check for server disconnections
-        VAR=$(lctl get_param -n *c.*.*server_uuid 2>&1)
+       VAR=$(lctl get_param -n *c.*.*server_uuid 2>&1)
        if [ $? = 0 ] ; then
                DISCON="$(echo $VAR | grep -v FULL)"
                if [ -n "$DISCON" ] ; then
@@ -659,7 +663,7 @@ health_check ()
        fi
 
        # check for servers in recovery
-       if [ -n "$MDT$OST" ] && grep -q RECOV $MDT $OST ; then
+       if [ -n "$MDT$OST" ] && echo $MDT $OST | grep -q RECOV ; then
                STATE="recovery"
                RETVAL=0
        fi