public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* resource-agents: master - rgmanager: Fix up multiple Oracle instance handling
@ 2009-06-22 17:59 Lon Hohberger
  0 siblings, 0 replies; only message in thread
From: Lon Hohberger @ 2009-06-22 17:59 UTC (permalink / raw)
  To: cluster-cvs-relay

Gitweb:        http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a=commitdiff;h=7c34432380e8f0df85ef81a76df8a3d271b06277
Commit:        7c34432380e8f0df85ef81a76df8a3d271b06277
Parent:        e8a9df4fbd83b41e50586a868475b7691c3db2bc
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Thu May 21 09:37:15 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Jun 22 13:55:13 2009 -0400

rgmanager: Fix up multiple Oracle instance handling

Note that you can only have one instance start/manage
Enterprise Manager.  You must set all other instances
to "base" type (see metadata).

Resolvs: 471226

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/resources/oracledb.sh.in |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/rgmanager/src/resources/oracledb.sh.in b/rgmanager/src/resources/oracledb.sh.in
index b702052..6bf382d 100644
--- a/rgmanager/src/resources/oracledb.sh.in
+++ b/rgmanager/src/resources/oracledb.sh.in
@@ -217,8 +217,8 @@ meta_data()
 	<action name="status" timeout="10"/>
 	<action name="monitor" timeout="10"/>
 
-	<action name="status" depth="10" timeout="30" interval="5m"/>
-	<action name="monitor" depth="10" timeout="30" interval="5m"/>
+	<action name="status" depth="10" timeout="30" interval="30"/>
+	<action name="monitor" depth="10" timeout="30" interval="30"/>
 
 	<action name="meta-data" timeout="5"/>
 	<action name="validate-all" timeout="5"/>
@@ -294,6 +294,7 @@ start_db()
 	grep -q "failure" $logfile
 	if [ $? -eq 0 ]; then
 		echo "ORACLE_SID Incorrectly set?"
+		rm -f $tmpfile
 		echo "See $logfile for more information."
 		return 1
 	fi
@@ -356,7 +357,8 @@ force_cleanup()
 	declare pids
 	declare pid
 
-	pids=`ps ax | grep $ORACLE_HOME | grep -v grep | awk '{print $1}'`
+	# Patch from Shane Bradley to fix 471266
+	pids=`ps ax | grep $ORACLE_HOME | grep "ora_.*_${ORACLE_SID}" | grep -v grep | awk '{print $1}'`
 
 	initlog -n $SCRIPT -s "<err> Not all Oracle processes exited cleanly, killing"
 	
@@ -804,7 +806,6 @@ status_oracle()
 {
 	declare -i subsys_lock=1
 	declare -i last 
-	declare -i depth=$1
 
 	#
 	# Check for lock file.  Crude and rudimentary, but it works


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-06-22 17:59 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-22 17:59 resource-agents: master - rgmanager: Fix up multiple Oracle instance handling Lon Hohberger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).