From 393ccc3bde6600dc5f1d4765322b2748bc9b21c2 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 14 Mar 2017 23:44:13 -0700 Subject: [PATCH] LU-9213 scripts: check MGT status in lustre init script This patch fixes health_check() in lustre init script to account for the status of MGT on a dedicated node. Test-Parameters: trivial Change-Id: Ifdf2e4a1002e870c25925b6e7fce82b132cc24f2 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/25995 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: John L. Hammond Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/scripts/lustre | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/lustre/scripts/lustre b/lustre/scripts/lustre index 0f8f082..919efb0 100644 --- a/lustre/scripts/lustre +++ b/lustre/scripts/lustre @@ -618,9 +618,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 +632,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 +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 -- 1.8.3.1