I'm really sorry but please disregard that patch. The more appropriate would be these two attached patches.
On Mon, May 17, 2010 at 11:35 AM, Serge Dubrouski <serge...@gmail.com> wrote: > Hello - > > Here is follow up patch for today's incident with pgsql script. The > patch is intended to cover up an issue with missed /sbin/fuser tool: > > --- /usr/lib/ocf/resource.d/heartbeat/pgsql 2010-05-03 01:20:16.000000000 > -0600 > +++ usr/lib/ocf/resource.d/heartbeat/pgsql.new 2010-05-17 > 11:32:33.000000000 -0600 > @@ -291,7 +291,7 @@ > if [ -f $PIDFILE ] > then > PID=`head -n 1 $PIDFILE` > - kill -0 $PID >/dev/null 2>&1 && fuser $OCF_RESKEY_pgdata > 2>&1 | grep $PID >/dev/null 2>&1 > + kill -0 $PID >/dev/null 2>&1 && /sbin/fuser > $OCF_RESKEY_pgdata 2>&1 | grep $PID >/dev/null 2>&1 > return $? > fi > > @@ -359,6 +359,11 @@ > return $OCF_ERR_INSTALLED > fi > > + if ! have_binary /sbin/fuser > + then > + return $OCF_ERR_INSTALLED > + fi > + > return $OCF_SUCCESS > } > > > > It also makes sense to update SPEC file for resource-agents package > with a dependency for psmisc package. > -- > Serge Dubrouski. > -- Serge Dubrouski.
--- a/heartbeat/pgsql 2010-05-03 01:20:16.000000000 -0600 +++ b/heartbeat/pgsql 2010-05-17 11:41:55.000000000 -0600 @@ -291,7 +291,7 @@ if [ -f $PIDFILE ] then PID=`head -n 1 $PIDFILE` - kill -0 $PID >/dev/null 2>&1 && fuser $OCF_RESKEY_pgdata 2>&1 | grep $PID >/dev/null 2>&1 + kill -0 $PID >/dev/null 2>&1 && $FUSER $OCF_RESKEY_pgdata 2>&1 | grep $PID >/dev/null 2>&1 return $? fi @@ -343,22 +343,27 @@ # Validate most critical parameters pgsql_validate_all() { - if ! have_binary $SH + if ! check_binary $SH then return $OCF_ERR_INSTALLED fi - if ! have_binary $OCF_RESKEY_pgctl + if ! check_binary $OCF_RESKEY_pgctl then return $OCF_ERR_INSTALLED fi - if ! have_binary $OCF_RESKEY_psql + if ! check_binary $OCF_RESKEY_psql then return $OCF_ERR_INSTALLED fi + if ! check_binary $FUSER + then + return $OCF_ERR_INSTALLED + fi + return $OCF_SUCCESS }
--- a/heartbeat/.ocf-binaries 2010-05-03 01:20:16.000000000 -0600 +++ b/heartbeat/.ocf-binaries 2010-05-17 11:45:06.000000000 -0600 @@ -15,13 +15,13 @@ : ${SH:=/bin/sh} : ${TEST:=/usr/bin/test} : ${TESTPROG:=/usr/bin/test} +: ${FUSER:=/sbin/fuser} # Entries that should probably be removed : ${BASENAME:=basename} : ${BLOCKDEV:=blockdev} : ${CAT:=cat} : ${FSCK:=fsck} -: ${FUSER:=fuser} : ${GETENT:=getent} : ${GREP:=grep} : ${IFCONFIG:=ifconfig}
_______________________________________________ Pacemaker mailing list: Pacemaker@oss.clusterlabs.org http://oss.clusterlabs.org/mailman/listinfo/pacemaker Project Home: http://www.clusterlabs.org Getting started: http://www.clusterlabs.org/doc/Cluster_from_Scratch.pdf