chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asrab...@apache.org
Subject svn commit: r781207 - in /hadoop/chukwa/trunk: ./ src/java/org/apache/hadoop/chukwa/extraction/archive/ src/java/org/apache/hadoop/chukwa/extraction/demux/
Date Tue, 02 Jun 2009 23:11:38 GMT
Author: asrabkin
Date: Tue Jun  2 23:11:37 2009
New Revision: 781207

URL: http://svn.apache.org/viewvc?rev=781207&view=rev
Log:
CHUKWA-249.  Use ChukwaConfiguration in Demux. Contributed by Jerome Boulon.

Modified:
    hadoop/chukwa/trunk/CHANGES.txt
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveBuilder.java
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java

Modified: hadoop/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=781207&r1=781206&r2=781207&view=diff
==============================================================================
--- hadoop/chukwa/trunk/CHANGES.txt (original)
+++ hadoop/chukwa/trunk/CHANGES.txt Tue Jun  2 23:11:37 2009
@@ -147,6 +147,8 @@
 
   BUG FIXES
 
+    CHUKWA-249. Use ChukwaConfiguration in Demux. (Jerome Boulon via asrabkin)
+
     CHUKWA-257. fixed right arrow image for date picker. (Eric Yang)
 
     CHUKWA-251. Added per widget Time range input. (Terence Kwan via Eric Yang)

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveBuilder.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveBuilder.java?rev=781207&r1=781206&r2=781207&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveBuilder.java
(original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveBuilder.java
Tue Jun  2 23:11:37 2009
@@ -21,6 +21,7 @@
 
 import org.apache.hadoop.chukwa.ChukwaArchiveKey;
 import org.apache.hadoop.chukwa.ChunkImpl;
+import org.apache.hadoop.chukwa.conf.ChukwaConfiguration;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.fs.Path;
@@ -54,8 +55,7 @@
       return printUsage();
     }
 
-    JobConf jobConf = new JobConf(getConf(), ChukwaArchiveBuilder.class);
-    jobConf.addResource(new Path("conf/chukwa-demux-conf.xml"));
+    JobConf jobConf = new JobConf(new ChukwaConfiguration(), ChukwaArchiveBuilder.class);
 
     jobConf.setInputFormat(SequenceFileInputFormat.class);
 

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java?rev=781207&r1=781206&r2=781207&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
(original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/DailyChukwaRecordRolling.java
Tue Jun  2 23:11:37 2009
@@ -275,7 +275,7 @@
   }
 
   public int run(String[] args) throws Exception {
-    JobConf conf = new JobConf(getConf(), DailyChukwaRecordRolling.class);
+    JobConf conf = new JobConf(new ChukwaConfiguration(), DailyChukwaRecordRolling.class);
 
     conf.setJobName("DailyChukwa-Rolling");
     conf.setInputFormat(SequenceFileInputFormat.class);

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java?rev=781207&r1=781206&r2=781207&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java (original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java Tue
Jun  2 23:11:37 2009
@@ -27,6 +27,7 @@
 import java.util.List;
 import org.apache.hadoop.chukwa.ChukwaArchiveKey;
 import org.apache.hadoop.chukwa.ChunkImpl;
+import org.apache.hadoop.chukwa.conf.ChukwaConfiguration;
 import org.apache.hadoop.chukwa.extraction.demux.processor.ChukwaOutputCollector;
 import org.apache.hadoop.chukwa.extraction.demux.processor.mapper.MapProcessor;
 import org.apache.hadoop.chukwa.extraction.demux.processor.mapper.MapProcessorFactory;
@@ -145,8 +146,8 @@
   }
 
   public int run(String[] args) throws Exception {
-    JobConf conf = new JobConf(getConf(), Demux.class);
-    conf.addResource(new Path("conf/chukwa-demux-conf.xml"));
+    JobConf conf = new JobConf(new ChukwaConfiguration(), Demux.class);
+    
 
     conf.setJobName("Chukwa-Demux_" + day.format(new Date()));
     conf.setInputFormat(SequenceFileInputFormat.class);

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java?rev=781207&r1=781206&r2=781207&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java
(original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/demux/HourlyChukwaRecordRolling.java
Tue Jun  2 23:11:37 2009
@@ -237,7 +237,7 @@
   }
 
   public int run(String[] args) throws Exception {
-    JobConf conf = new JobConf(getConf(), HourlyChukwaRecordRolling.class);
+    JobConf conf = new JobConf(new ChukwaConfiguration(), HourlyChukwaRecordRolling.class);
 
     conf.setJobName("HourlyChukwa-Rolling");
     conf.setInputFormat(SequenceFileInputFormat.class);



Mime
View raw message