cluster: RHEL57 - resource-agents: Use shutdown immediate in oracledb.sh
Lon Hohberger
lon at fedoraproject.org
Mon Mar 21 23:11:43 UTC 2011
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4c5fdf002d5f409c8a1acbba4a290c13b5d1e7e4
Commit: 4c5fdf002d5f409c8a1acbba4a290c13b5d1e7e4
Parent: 84e6165091312a1e5d31437485e713d47d9339ff
Author: Lon Hohberger <lhh at redhat.com>
AuthorDate: Mon Mar 7 09:56:52 2011 -0500
Committer: Lon Hohberger <lhh at redhat.com>
CommitterDate: Mon Mar 21 18:59:44 2011 -0400
resource-agents: Use shutdown immediate in oracledb.sh
Resolves: rhbz#633992
Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
rgmanager/src/resources/oracledb.sh | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/rgmanager/src/resources/oracledb.sh b/rgmanager/src/resources/oracledb.sh
index 3358783..bcb367f 100755
--- a/rgmanager/src/resources/oracledb.sh
+++ b/rgmanager/src/resources/oracledb.sh
@@ -319,12 +319,17 @@ stop_db()
declare tmpfile
declare logfile
declare -i rv
+ declare how_shutdown="$1"
+
+ if [ -z "$1" ]; then
+ how_shutdown="immediate"
+ fi
tmpfile=$(mktemp /tmp/$SCRIPT-stop.tmp.XXXXXX)
logfile=$(mktemp /tmp/$SCRIPT-stop.log.XXXXXX)
# Setup for Stop ...
- echo "shutdown abort" > $tmpfile
+ echo "shutdown $how_shutdown" > $tmpfile
echo "quit" >> $tmpfile
sqlplus "/ as sysdba" < $tmpfile &> $logfile
@@ -434,7 +439,7 @@ get_db_status()
# this db process is down - stop and
# (re)start all ora_XXXX_$ORACLE_SID processes
initlog -q -n $SCRIPT -s "Restarting Oracle Database..."
- stop_db
+ stop_db immediate
if [ $? != 0 ] ; then
# stop failed - return 1
return 1
@@ -776,7 +781,11 @@ stop_oracle()
action "Stopping Oracle EM:" emctl stop em || return 1
fi
- faction "Stopping Oracle Database:" stop_db || return 1
+ faction "Stopping Oracle Database:" stop_db immediate
+ if [ $? -ne 0 ]; then
+ faction "Stopping Oracle Database (hard):" stop_db abort || return 1
+ fi
+
action "Stopping Oracle Listener:" lsnrctl stop $ORACLE_LISTENER
faction "Waiting for all Oracle processes to exit:" exit_idle
More information about the cluster-commits
mailing list