Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 88428 invoked from network); 17 Jun 2010 12:41:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 17 Jun 2010 12:41:36 -0000 Received: (qmail 88676 invoked by uid 500); 17 Jun 2010 01:34:55 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 88594 invoked by uid 500); 17 Jun 2010 01:34:54 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 88587 invoked by uid 99); 17 Jun 2010 01:34:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jun 2010 01:34:54 +0000 X-ASF-Spam-Status: No, hits=-1294.0 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jun 2010 01:34:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A0BB023889B2; Thu, 17 Jun 2010 01:34:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r955438 - in /hadoop/common/trunk: CHANGES.txt src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj Date: Thu, 17 Jun 2010 01:34:08 -0000 To: common-commits@hadoop.apache.org From: cos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100617013408.A0BB023889B2@eris.apache.org> Author: cos Date: Thu Jun 17 01:34:08 2010 New Revision: 955438 URL: http://svn.apache.org/viewvc?rev=955438&view=rev Log: HADOOP-6828. Herrior uses old way of accessing logs directories. Contributed by Sreekanth Ramakrishnan Modified: hadoop/common/trunk/CHANGES.txt hadoop/common/trunk/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj Modified: hadoop/common/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=955438&r1=955437&r2=955438&view=diff ============================================================================== --- hadoop/common/trunk/CHANGES.txt (original) +++ hadoop/common/trunk/CHANGES.txt Thu Jun 17 01:34:08 2010 @@ -999,6 +999,9 @@ Release 0.21.0 - Unreleased BUG FIXES + HADOOP-6828. Herrior uses old way of accessing logs directories (Sreekanth + Ramakrishnan via cos) + HADOOP-6788. [Herriot] Exception exclusion functionality is not working correctly. (Vinay Thota via cos) Modified: hadoop/common/trunk/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj?rev=955438&r1=955437&r2=955438&view=diff ============================================================================== --- hadoop/common/trunk/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj (original) +++ hadoop/common/trunk/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj Thu Jun 17 01:34:08 2010 @@ -245,8 +245,8 @@ public aspect DaemonProtocolAspect { public String DaemonProtocol.getFilePattern() { //We use the environment variable HADOOP_LOGFILE to get the //pattern to use in the search. - String logDir = System.getenv("HADOOP_LOG_DIR"); - String daemonLogPattern = System.getenv("HADOOP_LOGFILE"); + String logDir = System.getProperty("hadoop.log.dir"); + String daemonLogPattern = System.getProperty("hadoop.log.file"); if(daemonLogPattern == null && daemonLogPattern.isEmpty()) { return "*"; }