From: TAKATSUKA Haruka <harukat@sraoss.co.jp>
Date: Fri, 11 May 2012 00:34:43 +0000 (+0900)
Subject: * Add "pkill -P 1 pgpool" when missing pgpool main process at stop-action
X-Git-Tag: PGPOOL_HA_2_0~3
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=7437074186022450ab26a7181fb66bdcee9a5b34;p=pgpoolha.git

* Add "pkill -P 1 pgpool" when missing pgpool main process at stop-action
* Add OCF_RESKEY_monitor_ip
* Fix indent
---

diff --git a/ChangeLog b/ChangeLog
index afcb2be..6a82dd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012/02/17
+	* add "pkill -P 1 pgpool" when missing pgpool main process at stop-action 
+	* add OCF_RESKEY_monitor_ip
+	* fix indent
+
 2010/11/8
 	* fix bug in pgpool.monitor arguments.
 
diff --git a/src/pgpool.in b/src/pgpool.in
index 7fe10ce..f705996 100755
--- a/src/pgpool.in
+++ b/src/pgpool.in
@@ -4,7 +4,7 @@
 #
 # Author: TANIDA Yutaka, TAKATSUKA Haruka
 #
-# Copyright (c) 2006-2010           PgPool Global Development Group 
+# Copyright (c) 2006-2012           PgPool Global Development Group 
 #
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose and without fee is hereby
@@ -18,7 +18,7 @@
 # is" without express or implied warranty.
 #
 # defined OCF_RESKEY_value:
-#    pgpoolconf pcpconf hbaconf logfile pidfile options pgpooluser
+#    pgpoolconf pcpconf hbaconf logfile pidfile options pgpooluser monitor_ip
 #
 #    default port number will be read from pgpool.conf automatically.
 
@@ -71,6 +71,11 @@ if [ "x$OCF_RESKEY_pidfile" = 'x' ]; then
 else
 	PGPOOL_PID=$OCF_RESKEY_pidfile
 fi
+if [ "x$OCF_RESKEY_monitor_ip" = 'x' ]; then
+	PGPOOL_MONITOR_IP=127.0.0.1
+else
+	PGPOOL_MONITOR_IP=$OCF_RESKEY_monitor_ip
+fi
 
 PGPOOL="$PGPOOLCMD -f $PGP_CONF" 
 PGPOOL_START_ARG=""
@@ -96,7 +101,7 @@ fi
 PGPOOL_STOP_ARG=" stop"
 PGPOOL_FORCE_STOP_ARG=" -m i $PGPOOL_STOP_ARG"
 PGPOOL_MONITOR=${PGPOOLCMD}.monitor 
-PGPOOL_MONITOR_ARGS="--conf=$PGP_CONF localhost"
+PGPOOL_MONITOR_ARGS="--conf=$PGP_CONF $PGPOOL_MONITOR_IP"
 
 # Source function library.
 . ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
@@ -118,22 +123,21 @@ case "$1" in
 	stop)
 	if check_pid
 	then
-#		RET=`su -c "$PGPOOL $PGPOOL_STOP_ARG | grep ERROR" $PGPOOLUSER` 
-#		ocf_log info "pgpoolRA: $RET"
-#		if [ -z "$RET" ] ; then
-#			exit 0
-#		else
-#  try immediate stop.
-			RET=`su -c "$PGPOOL $PGPOOL_FORCE_STOP_ARG | grep ERROR " $PGPOOLUSER`
-			ocf_log info "pgpoolRA: $RET"
-			if [ -z "$RET" ] ; then
-				exit 0;
-			else
-				exit 7;
-			fi
-#		fi
+		RET=`su -c "$PGPOOL $PGPOOL_FORCE_STOP_ARG | grep ERROR " $PGPOOLUSER`
+		ocf_log info "pgpoolRA: $RET"
+		if [ -z "$RET" ] ; then
+			exit 0;
+		else
+			exit 7;
+		fi
 	else
 		ocf_log info "pgpoolRA: request stop, but not running."
+		if which pkill ; then
+			if pkill -P 1 pgpool ; then
+				ocf_log info "pgpoolRA: purge orphaned pgpool processes."
+				sleep 1
+			fi
+		fi
 		exit 0 
 	fi
 	;;
@@ -171,63 +175,70 @@ cat <<EOF
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
   <resource-agent name="pgpool">
-    <version>1.0</version>
-    <longdesc lang="en">
+   <version>1.0</version>
+   <longdesc lang="en">
       OCF-spec start , stop ,and monitoring script for pgpool
-    </longdesc>
-    <shortdesc lang="en">pgpool server control.</shortdesc>
-    <parameters>
-      <parameter name="pgpoolconf" unique="0" required="0">
+   </longdesc>
+   <shortdesc lang="en">pgpool server control.</shortdesc>
+   <parameters>
+     <parameter name="pgpoolconf" unique="0" required="0">
       <longdesc lang="en">
         Path to pgpool.conf
       </longdesc>
       <shortdesc lang="en">pgpool.conf path</shortdesc>
       <content type="string" default="$PGP_CONF" />
-    </parameter>
-    <parameter name="pcpconf" unique="0" required="0">
+     </parameter>
+     <parameter name="pcpconf" unique="0" required="0">
       <longdesc lang="en">
         Path to pcp.conf. pgpool-II only.
       </longdesc>
       <shortdesc lang="en">pcp.conf</shortdesc>
       <content type="string" default="$PCP_CONF" />
-    </parameter>
-    <parameter name="hbaconf" unique="0" required="0">
+     </parameter>
+     <parameter name="hbaconf" unique="0" required="0">
       <longdesc lang="en">
-         Path to pool_hba.conf. requires pgpool > 3.2 only.
+         Path to pool_hba.conf.
       </longdesc>
       <shortdesc lang="en">pool_hba.conf</shortdesc>
       <content type="string" default="$HBA_CONF" />
-    </parameter>
-    <parameter name="logfile" unique="0" required="0">
+     </parameter>
+     <parameter name="logfile" unique="0" required="0">
       <longdesc lang="en">
          Path to output logfile . logfile contains debuglog. if this entry is empty , log output is depends on pgpool.
       </longdesc>
       <shortdesc lang="en">logfile</shortdesc>
       <content type="string" default="" />
-    </parameter>
-    <parameter name="pidfile" unique="0" required="0">
+     </parameter>
+     <parameter name="pidfile" unique="0" required="0">
       <longdesc lang="en">
          Path to pgpool.pid
       </longdesc>
       <shortdesc lang="en">pidfile</shortdesc>
       <content type="string" default="/tmp/pgpool.pid" />
-    </parameter>
-    <parameter name="options" unique="0" required="0">
+     </parameter>
+     <parameter name="options" unique="0" required="0">
       <longdesc lang="en">
          additional options of pgpool-II start command. (e.g. -d)
       </longdesc>
       <shortdesc lang="en">options</shortdesc>
       <content type="string" default="" />
-    </parameter>
-    <parameter name="pgpooluser" unique="0" required="0">
+     </parameter>
+     <parameter name="pgpooluser" unique="0" required="0">
       <longdesc lang="en">
          pgpool-II user. (e.g. "postgres"(default), "pgpool" or "root")
       </longdesc>
-      <shortdesc lang="en">options</shortdesc>
+      <shortdesc lang="en">pgpool user</shortdesc>
       <content type="string" default="postgres" />
-    </parameter>
+     </parameter>
+     <parameter name="monitor_ip" unique="0" required="0">
+      <longdesc lang="en">
+         pgpool-II monitor ip (e.g. "localhost"(default))
+      </longdesc>
+      <shortdesc lang="en">monitor ip</shortdesc>
+      <content type="string" default="localhost" />
+     </parameter>
    </parameters>
-  <actions>
+   <actions>
     <action name="start"   timeout="20" />
     <action name="stop"    timeout="20" />
     <action name="status"  timeout="10" />
@@ -235,7 +246,7 @@ cat <<EOF
     <action name="recover"  timeout="20" />
     <action name="reload"  timeout="20" />
     <action name="meta-data"  timeout="5" />
-  </actions>
+   </actions>
   </resource-agent>
 EOF
 	exit 0;