From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 351 invoked by alias); 22 Jun 2009 18:18:30 -0000 Received: (qmail 344 invoked by alias); 22 Jun 2009 18:18:30 -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: Check for all ORA- errors on start/stop 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: 6e006b82a07a86107199dded28f2927101c6c973 X-Git-Newrev: a959c70738f2ccb4d4dede42c658a11fc8dbc946 From: Lon Hohberger Message-Id: <20090622175830.9330B12025B@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: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00668.txt.bz2 Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a=commitdiff;h=a959c70738f2ccb4d4dede42c658a11fc8dbc946 Commit: a959c70738f2ccb4d4dede42c658a11fc8dbc946 Parent: 6e006b82a07a86107199dded28f2927101c6c973 Author: Lon Hohberger AuthorDate: Thu May 21 09:51:00 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Jun 22 13:55:23 2009 -0400 rgmanager: Check for all ORA- errors on start/stop Resolves: 471066 --- rgmanager/src/resources/oracledb.sh.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/resources/oracledb.sh.in b/rgmanager/src/resources/oracledb.sh.in index 6bf382d..809605e 100644 --- a/rgmanager/src/resources/oracledb.sh.in +++ b/rgmanager/src/resources/oracledb.sh.in @@ -291,7 +291,8 @@ start_db() # ORA-.....: failure, we failed # - grep -q "failure" $logfile + rm -f $tmpfile + grep -q "^ORA-" $logfile if [ $? -eq 0 ]; then echo "ORACLE_SID Incorrectly set?" rm -f $tmpfile @@ -336,7 +337,8 @@ stop_db() # # If we see 'failure' in the log, we're done. # - grep -q failure $logfile + rm -f $tmpfile + grep -q "^ORA-" $logfile if [ $? -eq 0 ]; then echo_failure echo