From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26890 invoked by alias); 21 May 2009 14:28:40 -0000 Received: (qmail 26883 invoked by alias); 21 May 2009 14:28:40 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.0 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: cluster: RHEL5 - rgmanager: Remove extra checks from Oracle agents To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: a1cb7f4397f4c66f912e1b2871707777b87e35ef X-Git-Newrev: 222230d643cd293187eebf85a5d5f79368eb63e4 From: Lon Hohberger Message-Id: <20090521142814.1DF391201FA@lists.fedorahosted.org> Date: Thu, 21 May 2009 14:28: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/msg00354.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=222230d643cd293187eebf85a5d5f79368eb63e4 Commit: 222230d643cd293187eebf85a5d5f79368eb63e4 Parent: a1cb7f4397f4c66f912e1b2871707777b87e35ef Author: Lon Hohberger AuthorDate: Wed May 20 18:23:16 2009 -0400 Committer: Lon Hohberger CommitterDate: Thu May 21 10:27:57 2009 -0400 rgmanager: Remove extra checks from Oracle agents Resolves: 470917 Signed-off-by: Lon Hohberger --- rgmanager/src/resources/oracleas | 14 ++++---------- rgmanager/src/resources/oracledb.sh | 13 ++++--------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/rgmanager/src/resources/oracleas b/rgmanager/src/resources/oracleas index 21056df..9ead29c 100755 --- a/rgmanager/src/resources/oracleas +++ b/rgmanager/src/resources/oracleas @@ -167,14 +167,9 @@ meta_data() - - - - - @@ -716,7 +711,6 @@ status_ias() { declare -i subsys_lock=1 declare -i last - declare -i depth=$1 # # Check for lock file. Crude and rudimentary, but it works @@ -726,17 +720,17 @@ status_ias() fi # Check database status - get_db_status $subsys_lock $depth + get_db_status $subsys_lock update_status $? # Start last=$? # Check & report listener status - get_lsnr_status $subsys_lock $depth + get_lsnr_status $subsys_lock update_status $? $last last=$? # Check & report opmn / opmn-managed process status - get_opmn_status $subsys_lock $depth + get_opmn_status $subsys_lock update_status $? $last last=$? @@ -770,7 +764,7 @@ case $1 in exit $? ;; status|monitor) - status_ias $OCF_CHECK_LEVEL + status_ias exit $? ;; restart) diff --git a/rgmanager/src/resources/oracledb.sh b/rgmanager/src/resources/oracledb.sh index 5b8e113..86f4b74 100755 --- a/rgmanager/src/resources/oracledb.sh +++ b/rgmanager/src/resources/oracledb.sh @@ -209,14 +209,9 @@ meta_data() - - - - - @@ -800,12 +795,12 @@ status_oracle() fi # Check database status - get_db_status $subsys_lock $depth + get_db_status $subsys_lock update_status $? # Start last=$? # Check & report listener status - get_lsnr_status $subsys_lock $depth + get_lsnr_status $subsys_lock update_status $? $last last=$? @@ -816,7 +811,7 @@ status_oracle() last=$? elif [ "$ORACLE_TYPE" = "10g-ias" ]; then # Check & report opmn / opmn-managed process status - get_opmn_status $subsys_lock $depth + get_opmn_status $subsys_lock update_status $? $last last=$? fi @@ -853,7 +848,7 @@ case $1 in exit $? ;; status|monitor) - status_oracle $OCF_CHECK_LEVEL + status_oracle exit $? ;; restart)