Return-Path: Delivered-To: apmail-hadoop-chukwa-commits-archive@minotaur.apache.org Received: (qmail 86113 invoked from network); 20 Dec 2009 06:09:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Dec 2009 06:09:00 -0000 Received: (qmail 98545 invoked by uid 500); 20 Dec 2009 06:09:00 -0000 Delivered-To: apmail-hadoop-chukwa-commits-archive@hadoop.apache.org Received: (qmail 98528 invoked by uid 500); 20 Dec 2009 06:09:00 -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 98518 invoked by uid 99); 20 Dec 2009 06:08:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Dec 2009 06:08:59 +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, 20 Dec 2009 06:08:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5480023888FD; Sun, 20 Dec 2009 06:08:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r892567 - in /hadoop/chukwa/trunk: ./ src/java/org/apache/hadoop/chukwa/datacollection/writer/ Date: Sun, 20 Dec 2009 06:08:36 -0000 To: chukwa-commits@hadoop.apache.org From: asrabkin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091220060836.5480023888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: asrabkin Date: Sun Dec 20 06:08:35 2009 New Revision: 892567 URL: http://svn.apache.org/viewvc?rev=892567&view=rev Log: CHUKWA-432. PipelineableWriter becomes an abstract class. Modified: hadoop/chukwa/trunk/CHANGES.txt hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/Dedup.java hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineableWriter.java hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/SocketTeeWriter.java Modified: hadoop/chukwa/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=892567&r1=892566&r2=892567&view=diff ============================================================================== --- hadoop/chukwa/trunk/CHANGES.txt (original) +++ hadoop/chukwa/trunk/CHANGES.txt Sun Dec 20 06:08:35 2009 @@ -18,6 +18,8 @@ IMPROVEMENTS + CHUKWA-432. PipelineableWriter becomes an abstract class. (asrabkin) + CHUKWA-429. Update HDFS heatmap color with rainbow colors. (Eric Yang) CHUKWA-418. Standardize logging. Mark adaptor IDs. (asrabkin) Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/Dedup.java URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/Dedup.java?rev=892567&r1=892566&r2=892567&view=diff ============================================================================== --- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/Dedup.java (original) +++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/Dedup.java Sun Dec 20 06:08:35 2009 @@ -25,8 +25,12 @@ import java.util.Queue; import org.apache.hadoop.chukwa.Chunk; import org.apache.hadoop.conf.Configuration; - -public class Dedup implements PipelineableWriter { +/** + * Uses a fixed size cache to check for and filter out duplicate chunks. + * Duplicate detection uses chunk metadata, not content. + * + */ +public class Dedup extends PipelineableWriter { static final class DedupKey { String name; @@ -92,12 +96,7 @@ } FixedSizeCache cache; - ChukwaWriter next; - @Override - public void setNextStage(ChukwaWriter next) { - this.next = next; - } @Override public CommitStatus add(List chunks) throws WriterException { Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineableWriter.java URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineableWriter.java?rev=892567&r1=892566&r2=892567&view=diff ============================================================================== --- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineableWriter.java (original) +++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/PipelineableWriter.java Sun Dec 20 06:08:35 2009 @@ -18,7 +18,22 @@ package org.apache.hadoop.chukwa.datacollection.writer; +import java.util.List; +import org.apache.hadoop.chukwa.Chunk; -public interface PipelineableWriter extends ChukwaWriter { - public void setNextStage(ChukwaWriter next); + +public abstract class PipelineableWriter implements ChukwaWriter { + ChukwaWriter next; + public void setNextStage(ChukwaWriter next) { + this.next = next; + } + + public CommitStatus add(List chunks) throws WriterException { + if (next != null) + return next.add(chunks); //pass data through + else + return ChukwaWriter.COMMIT_OK; + } + + } Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/SocketTeeWriter.java URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/SocketTeeWriter.java?rev=892567&r1=892566&r2=892567&view=diff ============================================================================== --- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/SocketTeeWriter.java (original) +++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/writer/SocketTeeWriter.java Sun Dec 20 06:08:35 2009 @@ -57,7 +57,7 @@ * Option chukwaCollector.tee.keepalive controls using TCP keepalive. Defaults to true. * */ -public class SocketTeeWriter implements PipelineableWriter { +public class SocketTeeWriter extends PipelineableWriter { public static final String WRITABLE = "WRITABLE"; public static final String RAW = "RAW"; @@ -248,7 +248,7 @@ public CommitStatus add(List chunks) throws WriterException { CommitStatus rv = ChukwaWriter.COMMIT_OK; if (next != null) - rv = next.add(chunks); //pass data through + rv = next.add(chunks); //pass data through synchronized(tees) { Iterator loop = tees.iterator(); while(loop.hasNext()) {