From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9535 invoked by alias); 22 Jun 2009 17:59:05 -0000 Received: (qmail 9529 invoked by alias); 22 Jun 2009 17:59:05 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: resource-agents: master - rgmanager: Fix up multiple Oracle instance handling To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: resource-agents.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e8a9df4fbd83b41e50586a868475b7691c3db2bc X-Git-Newrev: 7c34432380e8f0df85ef81a76df8a3d271b06277 From: Lon Hohberger Message-Id: <20090622175826.414C612020D@lists.fedorahosted.org> Date: Mon, 22 Jun 2009 17:59:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00662.txt.bz2 Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a=commitdiff;h=7c34432380e8f0df85ef81a76df8a3d271b06277 Commit: 7c34432380e8f0df85ef81a76df8a3d271b06277 Parent: e8a9df4fbd83b41e50586a868475b7691c3db2bc Author: Lon Hohberger AuthorDate: Thu May 21 09:37:15 2009 -0400 Committer: Lon Hohberger 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 --- 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() - - + + @@ -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 " 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