Return-Path: Delivered-To: apmail-hadoop-chukwa-commits-archive@minotaur.apache.org Received: (qmail 3497 invoked from network); 28 Jun 2009 17:34:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Jun 2009 17:34:00 -0000 Received: (qmail 15630 invoked by uid 500); 28 Jun 2009 17:34:11 -0000 Delivered-To: apmail-hadoop-chukwa-commits-archive@hadoop.apache.org Received: (qmail 15616 invoked by uid 500); 28 Jun 2009 17:34:11 -0000 Mailing-List: contact chukwa-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chukwa-dev@hadoop.apache.org Delivered-To: mailing list chukwa-commits@hadoop.apache.org Received: (qmail 15606 invoked by uid 99); 28 Jun 2009 17:34:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Jun 2009 17:34:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Sun, 28 Jun 2009 17:34:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9E9B02388896; Sun, 28 Jun 2009 17:33:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r789131 - in /hadoop/chukwa/trunk: CHANGES.txt src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLog.java Date: Sun, 28 Jun 2009 17:33:48 -0000 To: chukwa-commits@hadoop.apache.org From: asrabkin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090628173348.9E9B02388896@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: asrabkin Date: Sun Jun 28 17:33:48 2009 New Revision: 789131 URL: http://svn.apache.org/viewvc?rev=789131&view=rev Log: CHUKWA-335. Discard meta line in job history file. Contributed by Cheng Zhang. Modified: hadoop/chukwa/trunk/CHANGES.txt hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLog.java Modified: hadoop/chukwa/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=789131&r1=789130&r2=789131&view=diff ============================================================================== --- hadoop/chukwa/trunk/CHANGES.txt (original) +++ hadoop/chukwa/trunk/CHANGES.txt Sun Jun 28 17:33:48 2009 @@ -76,6 +76,8 @@ BUG FIXES + CHUKWA-335. Discard meta line in job history file. (Cheng Zhang via asrabkin) + CHUKWA-330. Make separation between fixed adaptor parameters and optional adaptor parameters for generating adaptor id. (Ari Rabkin via Eric Yang) CHUKWA-37. Remove stale and unused bin scripts. (asrabkin) Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLog.java URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLog.java?rev=789131&r1=789130&r2=789131&view=diff ============================================================================== --- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLog.java (original) +++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLog.java Sun Jun 28 17:33:48 2009 @@ -47,7 +47,7 @@ return null; } recordEntry = recordEntry.trim(); - if(recordEntry.length() == 0) { + if(recordEntry.length() == 0 || recordEntry.startsWith("Meta")) { savedLines = ""; return null; }