This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: RHEL5 - rgmanager: Remove extra checks from Oracle agents
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Thu, 21 May 2009 14:28:14 +0000 (UTC)
- Subject: cluster: RHEL5 - rgmanager: Remove extra checks from Oracle agents
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=222230d643cd293187eebf85a5d5f79368eb63e4
Commit: 222230d643cd293187eebf85a5d5f79368eb63e4
Parent: a1cb7f4397f4c66f912e1b2871707777b87e35ef
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:27:57 2009 -0400
rgmanager: Remove extra checks from Oracle agents
Resolves: 470917
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
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()
<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="verify-all" timeout="5"/>
</actions>
@@ -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()
<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="verify-all" timeout="5"/>
</actions>
@@ -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)