From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-11364-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 461 invoked by alias); 22 Jun 2009 18:18:41 -0000
Received: (qmail 455 invoked by alias); 22 Jun 2009 18:18:41 -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: Remove extra checks from Oracle
	agents
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: 29095d987e34a8832217f7d834de0f13454856fb
X-Git-Newrev: e8a9df4fbd83b41e50586a868475b7691c3db2bc
From: Lon Hohberger <lon@fedoraproject.org>
Message-Id: <20090622175824.1D0561201D4@lists.fedorahosted.org>
Date: Mon, 22 Jun 2009 18:18: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: <cluster-cvs.sourceware.org>
List-Subscribe: <mailto:cluster-cvs-subscribe@sourceware.org>
List-Post: <mailto:cluster-cvs@sourceware.org>
List-Help: <mailto:cluster-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cluster-cvs-owner@sourceware.org
X-SW-Source: 2009-q2/txt/msg00669.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a=commitdiff;h=e8a9df4fbd83b41e50586a868475b7691c3db2bc
Commit:        e8a9df4fbd83b41e50586a868475b7691c3db2bc
Parent:        29095d987e34a8832217f7d834de0f13454856fb
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Wed May 20 18:23:16 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Jun 22 13:55:07 2009 -0400

rgmanager: Remove extra checks from Oracle agents

Resolves: 470917

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

diff --git a/rgmanager/src/resources/oracledb.sh.in b/rgmanager/src/resources/oracledb.sh.in
index 4041a34..b702052 100644
--- a/rgmanager/src/resources/oracledb.sh.in
+++ b/rgmanager/src/resources/oracledb.sh.in
@@ -217,14 +217,9 @@ meta_data()
 	<action name="status" timeout="10"/>
 	<action name="monitor" timeout="10"/>
 
-	<!-- Checks to see if we can read from the mountpoint -->
 	<action name="status" depth="10" timeout="30" interval="5m"/>
 	<action name="monitor" depth="10" timeout="30" interval="5m"/>
 
-	<!-- Checks to see if we can write to the mountpoint (if !ROFS) -->
-	<action name="status" depth="20" timeout="90" interval="10m"/>
-	<action name="monitor" depth="20" timeout="90" interval="10m"/>
-
 	<action name="meta-data" timeout="5"/>
 	<action name="validate-all" timeout="5"/>
     </actions>
@@ -819,12 +814,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=$?
 	
@@ -835,7 +830,7 @@ status_oracle()
 		last=$?
 	elif [ "$ORACLE_TYPE" = "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
@@ -872,7 +867,7 @@ case $1 in
 		exit $?
 		;;
 	status|monitor)
-		status_oracle $OCF_CHECK_LEVEL
+		status_oracle
 		exit $?
 		;;
 	restart)