This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - rgmanager: Fix up multiple Oracle instance handling
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Thu, 21 May 2009 14:53:41 +0000 (UTC)
- Subject: cluster: STABLE3 - rgmanager: Fix up multiple Oracle instance handling
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6c667e94643927342df40e90d0100a07c95286dd
Commit: 6c667e94643927342df40e90d0100a07c95286dd
Parent: 0427055c4f10c37daed21dc56ea499b18f016cc5
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Thu May 21 09:37:15 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Thu May 21 10:53:15 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