From: Nathaniel Clark <nathaniel.l.clark@intel.com>
Date: Thu, 21 Sep 2017 17:09:18 +0000 (-0400)
Subject: LU-10007 pacemaker: Use lctl and load lustre
X-Git-Tag: 2.10.55~11
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6e299c2a3bd7566a322cf9bc9494f6850d2c1b7e

LU-10007 pacemaker: Use lctl and load lustre

When scripts are started, load lustre module.
Use lctl instead of directly accessing health_check file.

Test-Parameters: trivial
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: I4a81248939464e498006dc2c4072d44685add018
Reviewed-on: https://review.whamcloud.com/29144
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
---

diff --git a/contrib/scripts/pacemaker/healthLNET b/contrib/scripts/pacemaker/healthLNET
index 4676026..8ebf587 100755
--- a/contrib/scripts/pacemaker/healthLNET
+++ b/contrib/scripts/pacemaker/healthLNET
@@ -187,16 +187,20 @@ END
 }
 
 ping_start() {
-    ping_monitor
-    if [ $? =  $OCF_SUCCESS ]; then
-	return $OCF_SUCCESS
-    fi
-    touch ${OCF_RESKEY_pidfile}
-    ping_update
+	modprobe lustre
+	rc=$?
+	if [ $rc -ne 0 ]; then
+		return $OCF_ERR_INSTALLED
+	fi
+	ping_monitor
+	if [ $? =  $OCF_SUCCESS ]; then
+		return $OCF_SUCCESS
+	fi
+	touch ${OCF_RESKEY_pidfile}
+	ping_update
 }
 
 ping_stop() {
-
 	rm -f ${OCF_RESKEY_pidfile}
 	attrd_updater -D -n $OCF_RESKEY_name -d $OCF_RESKEY_dampen $attrd_options
 	return $OCF_SUCCESS
diff --git a/contrib/scripts/pacemaker/healthLUSTRE b/contrib/scripts/pacemaker/healthLUSTRE
index 07e0bad..4ca2e5e 100755
--- a/contrib/scripts/pacemaker/healthLUSTRE
+++ b/contrib/scripts/pacemaker/healthLUSTRE
@@ -123,6 +123,11 @@ END
 }
 
 lustre_start() {
+	modprobe lustre
+	rc=$?
+	if [ $rc -ne 0 ]; then
+		return $OCF_ERR_INSTALLED
+	fi
 	lustre_monitor
 	if [ $? =  $OCF_SUCCESS ]; then
 		return $OCF_SUCCESS
@@ -153,12 +158,12 @@ lustre_check() {
 	active=0
 
 	# added head -1 due the LU-7486
-	l_out=`cat /proc/fs/lustre/health_check | head -1 |grep -w healthy 2>&1`; rc=$?
+	l_out=`lctl get_param -n health_check | head -1 |grep -w healthy 2>&1`; rc=$?
 
 	case $rc in
 	    0) active=`expr $active + 1`;;
 	    1) lustre_conditional_log warn "Lustre is not healthy: $l_out";;
-	    *) ocf_log err "Unexpected result for '/proc/fs/lustre/health_check' $rc: $l_out";;
+	    *) ocf_log err "Unexpected result for 'lctl get_param health_check' $rc: $l_out";;
 	esac
 	return $active
 }
@@ -179,13 +184,6 @@ lustre_update() {
 	return 0
 }
 
-
-if [ ! -f /proc/fs/lustre/health_check ]; then
-	ocf_log warn "Attention Health_Check file doesn't exist. Lustre will be loaded"
-	modprobe lustre
-fi
-
-
 if [ ${OCF_RESKEY_CRM_meta_globally_unique} = "false" ]; then
 	: ${OCF_RESKEY_pidfile:="$HA_VARRUN/healthLUSTRE-${OCF_RESKEY_name}"}
 else