X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fscripts%2Flustre;h=0f8f0825fe4be6e5c96de4597f1ca4a75d27f897;hb=09898fdea91045c7414a7b326811b819c670263c;hp=b97951fb5650af0b841ecc98ec5cc331dd7f982a;hpb=e9a8683eacd71a7f11f157b39c616e6f1169d685;p=fs%2Flustre-release.git

diff --git a/lustre/scripts/lustre b/lustre/scripts/lustre
index b97951f..0f8f082 100644
--- 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
@@ -498,6 +498,7 @@ stop_services ()
 {
 	local labels=$*
 	local result=0
+	local pids=""
 	local dir dev label
 
 	for label in $labels; do
@@ -512,9 +513,22 @@ stop_services ()
 			# no error
 			continue
 		fi
+
 		echo "Unmounting $dir"
-		umount $dir || result=2
+		umount $dir &
+
+		if [ -z "$pids" ]; then
+			pids="$!"
+		else
+			pids="$pids $!"
+		fi
+	done
+
+	# wait for all umount processes to complete, report any errors
+	for pid in $pids; do
+		wait $pid || result=2
 	done
+
 	# double check!
 	for label in $labels; do
 		if mountpt_is_active $label; then
@@ -581,6 +595,7 @@ stop_lustre_services ()
 # General lustre health check - not device specific.
 health_check ()
 {
+
 	old_nullglob="`shopt -p nullglob`"
 	shopt -u nullglob
 
@@ -594,55 +609,71 @@ health_check ()
 	egrep -q "libcfs|lvfs|portals" /proc/modules && STATE="loaded"
 
 	# check for any configured devices (may indicate partial startup)
-	if [ -d /proc/fs/lustre ]; then
-		if [ -n "`cat /proc/fs/lustre/devices 2> /dev/null`" ] ; then
+	VAR=$(lctl get_param version 2>&1)
+	if [ $? = 0 ] ; then
+		VAR=$(lctl get_param -n devices 2>&1)
+		if [ $? = 0 ] ; then
 			STATE="partial"
 			RETVAL=150
 		fi
 
 		# check for either a server or a client filesystem
-		MDT="`ls /proc/fs/lustre/mdt/*/recovery_status 2> /dev/null`"
-		OST="`ls /proc/fs/lustre/obdfilter/*/recovery_status \
-			2> /dev/null`"
-		LLITE="`ls /proc/fs/lustre/llite/fs* 2> /dev/null`"
-		if [ "$MDT" -o "$OST" -o "$LLITE" ]; then
-			STATE="running"
-			RETVAL=0
+		MDT=""
+		OST=""
+		LLITE=""
+
+		VAR=$(lctl get_param -n mdt.*.recovery_status 2>&1 | grep '^status:'  )
+		if [ $? = 0 ] ; then
+			MDT=$VAR
 		fi
+
+		VAR=$(lctl get_param -n obdfilter.*.recovery_status 2>&1 | grep '^status:')
+		if [ $? = 0 ] ; then
+                        OST=$VAR
+                fi
+
+                VAR=$(lctl get_param -n llite.fs* 2>&1)
+		if [ $? = 0 ] ; then
+                        LLITE="YES"
+                fi
+
+                if [ "$MDT" -o "$OST" -o "$LLITE" ]; then
+                        STATE="running"
+                        RETVAL=0
+                fi
 	else
 		# check if this is a router
-		if [ -d /proc/sys/lnet ]; then
-			ROUTER="`cat /proc/sys/lnet/routes | head -1 |
-				grep -i -c \"Routing enabled\"`"
-			if [[ ! -z ${ROUTER} && ${ROUTER} -ge 1 ]]; then
-				STATE="running"
-				RETVAL=0
-			fi
+		if [[ "$(lctl get_param -n routes)" =~ "Routing enabled" ]]; then
+			STATE="running"
+			RETVAL=0
 		fi
 	fi
 
 	# check for server disconnections
-	DISCON="`grep -v FULL /proc/fs/lustre/*c/*/*server_uuid 2> /dev/null`"
-	if [ -n "$DISCON" ] ; then
-		STATE="disconnected"
-		RETVAL=0
+        VAR=$(lctl get_param -n *c.*.*server_uuid 2>&1)
+	if [ $? = 0 ] ; then
+		DISCON="$(echo $VAR | grep -v FULL)"
+	        if [ -n "$DISCON" ] ; then
+			STATE="disconnected"
+			RETVAL=0
+		fi
 	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
 
 	# check for error in health_check
-	HEALTH="/proc/fs/lustre/health_check"
-	if [ -f "$HEALTH" ] && grep -q "NOT HEALTHY" $HEALTH ; then
+	local health_check=$(lctl get_param -n health_check)
+	if [[ "$health_check" =~ "NOT HEALTHY" ]]; then
 		STATE="unhealthy"
 		RETVAL=1
 	fi
 
 	# check for LBUG
-	if [ -f  "$HEALTH" ] && grep -q "LBUG" $HEALTH ; then
+	if [[ "$health_check" =~ "LBUG" ]]; then
 		STATE="LBUG"
 		RETVAL=152
 	fi