LU-13773 tests: subscript failure propagation

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

diff --git a/lustre/scripts/lustre b/lustre/scripts/lustre
index 0f8f082..a615b74 100644 (file)
--- a/lustre/scripts/lustre
+++ b/lustre/scripts/lustre
@@ -7,6 +7,13 @@
 # description:  Part of the lustre file system.
 # probe: true
 # config: /etc/sysconfig/lustre
+### BEGIN INIT INFO
+# Provides: lustre
+# Required-Start: lnet
+# Defalt-Start: -
+# Default-Stop: 0 1 6
+# Description: Lustre init script
+### END INIT INFO
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -448,13 +455,14 @@ start_services ()
                        assemble_md_device $journal $raidtab 2>/dev/null
                fi
 
+               if mountpt_is_active $label || \
+                  device_is_active $label; then
+                       echo "$label is already mounted"
+                       # no error
+                       continue
+               fi
+
                if [ "x$devtype" != "xzfs" ] ; then
-                       if mountpt_is_active $label || \
-                          device_is_active $label; then
-                               echo "$label is already mounted"
-                               # no error
-                               continue
-                       fi
                        if ! mmp_test $dev; then
                                result=2
                                continue
@@ -618,9 +626,12 @@ 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 | grep '^status:'  )
                if [ $? = 0 ] ; then
@@ -629,18 +640,18 @@ health_check ()
 
                VAR=$(lctl get_param -n obdfilter.*.recovery_status 2>&1 | grep '^status:')
                if [ $? = 0 ] ; then
-                        OST=$VAR
-                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
@@ -650,7 +661,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