Gitweb:
http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=be05457a5d3...
Commit: be05457a5d3ff4a6190b30055c6c64fde8108998
Parent: cdc558cc871681a51cbf0ca6559f4db6a3b81775
Author: Ryan McCabe <rmccabe(a)redhat.com>
AuthorDate: Fri Nov 1 11:16:31 2013 -0400
Committer: Ryan McCabe <rmccabe(a)redhat.com>
CommitterDate: Fri Nov 1 11:16:31 2013 -0400
rgmanager: oracledb.sh: Remove quotes around listener name
Remove quotes around the listener name variable in calls to lsnrctl.
The quotes caused the commands to fail when a listener name was not
specified in the cluster configuration.
Resolves: rhbz#1022723
Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com>
---
rgmanager/src/resources/oracledb.sh | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/rgmanager/src/resources/oracledb.sh b/rgmanager/src/resources/oracledb.sh
old mode 100755
new mode 100644
index 2bbb807..e35fea7
--- a/rgmanager/src/resources/oracledb.sh
+++ b/rgmanager/src/resources/oracledb.sh
@@ -462,7 +462,7 @@ get_lsnr_status()
declare -i rv
ocf_log debug "Checking status for listener $ORACLE_LISTENER"
- lsnrctl status "$ORACLE_LISTENER" >& /dev/null
+ lsnrctl status $ORACLE_LISTENER >& /dev/null
rv=$?
if [ $rv -eq 0 ] ; then
ocf_log debug "Listener $ORACLE_LISTENER is up"
@@ -479,8 +479,8 @@ get_lsnr_status()
# Listener is NOT running (but should be) - try to restart
for (( i=$RESTART_RETRIES ; i; i-- )) ; do
ocf_log info "Listener $ORACLE_LISTENER is down, attempting to restart"
- lsnrctl start "$ORACLE_LISTENER" >& /dev/null
- lsnrctl status "$ORACLE_LISTENER" >& /dev/null
+ lsnrctl start $ORACLE_LISTENER >& /dev/null
+ lsnrctl status $ORACLE_LISTENER >& /dev/null
if [ $? -eq 0 ] ; then
ocf_log info "Listener $ORACLE_LISTENER was restarted successfully"
break # Listener was (re)started and is running fine
@@ -493,7 +493,7 @@ get_lsnr_status()
return 1
fi
- lsnrctl_stdout=$(lsnrctl status "$ORACLE_LISTENER")
+ lsnrctl_stdout=$(lsnrctl status $ORACLE_LISTENER)
rv=$?
if [ $rv -ne 0 ] ; then
ocf_log error "Starting listener $ORACLE_LISTENER failed: $rv output
$lsnrctl_stdout"
@@ -754,7 +754,7 @@ start_oracle()
fi
ocf_log info "Starting listener $ORACLE_LISTENER"
- lsnrctl_stdout=$(lsnrctl start "$ORACLE_LISTENER")
+ lsnrctl_stdout=$(lsnrctl start $ORACLE_LISTENER)
rv=$?
if [ $rv -ne 0 ]; then
ocf_log debug "[$ORACLE_SID] Listener $ORACLE_LISTENER start returned $rv output
$lsnrctl_stdout"
@@ -894,7 +894,7 @@ stop_oracle()
fi
ocf_log info "Stopping listener $ORACLE_LISTENER for $ORACLE_SID"
- lsnrctl_stdout=$(lsnrctl stop "$ORACLE_LISTENER")
+ lsnrctl_stdout=$(lsnrctl stop $ORACLE_LISTENER)
rv=$?
if [ $? -ne 0 ]; then
ocf_log error "Listener $ORACLE_LISTENER stop failed for $ORACLE_SID: $rv output
$lsnrctl_stdout"