cluster: STABLE3 - rgmanager: Remove extra checks from Oracle agents

[Lon Hohberger]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0427055c4f10c37daed21dc56ea499b18f016cc5
Commit:        0427055c4f10c37daed21dc56ea499b18f016cc5
Parent:        3db1f745df1bc7461a8183341d7bcce82a9810be
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Wed May 20 18:23:16 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Thu May 21 10:53:15 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)