You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by ey...@apache.org on 2010/03/23 01:07:11 UTC
svn commit: r926408 - in /hadoop/chukwa/branches/chukwa-0.4/src:
java/org/apache/hadoop/chukwa/extraction/
java/org/apache/hadoop/chukwa/extraction/archive/
java/org/apache/hadoop/chukwa/extraction/demux/
test/org/apache/hadoop/chukwa/extraction/demux/
Author: eyang
Date: Tue Mar 23 00:07:11 2010
New Revision: 926408
URL: http://svn.apache.org/viewvc?rev=926408&view=rev
Log:
CHUKWA-460. Removed dependency of writer.hdfs.filesystem for demux phase. (Eric Yang)
Modified:
hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java
hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveManager.java
hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/demux/DemuxManager.java
hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/demux/PostProcessorManager.java
hadoop/chukwa/branches/chukwa-0.4/src/test/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java
Modified: hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java?rev=926408&r1=926407&r2=926408&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java (original)
+++ hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java Tue Mar 23 00:07:11 2010
@@ -19,7 +19,7 @@
package org.apache.hadoop.chukwa.extraction;
public interface CHUKWA_CONSTANT {
-
+ public static final String HDFS_DEFAULT_NAME_FIELD = "fs.default.name";
public static final String WRITER_HDFS_FILESYSTEM_FIELD = "writer.hdfs.filesystem";
public static final String CHUKWA_ROOT_DIR_FIELD = "chukwaRootDir";
public static final String CHUKWA_ROOT_REPOS_DIR_FIELD = "chukwaRootReposDir";
Modified: hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveManager.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveManager.java?rev=926408&r1=926407&r2=926408&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveManager.java (original)
+++ hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/archive/ChukwaArchiveManager.java Tue Mar 23 00:07:11 2010
@@ -55,7 +55,7 @@ public class ChukwaArchiveManager implem
}
protected void init() throws IOException, URISyntaxException {
- String fsName = conf.get(WRITER_HDFS_FILESYSTEM_FIELD);
+ String fsName = conf.get(HDFS_DEFAULT_NAME_FIELD);
fs = FileSystem.get(new URI(fsName), conf);
}
Modified: hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/demux/DemuxManager.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/demux/DemuxManager.java?rev=926408&r1=926407&r2=926408&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/demux/DemuxManager.java (original)
+++ hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/demux/DemuxManager.java Tue Mar 23 00:07:11 2010
@@ -85,7 +85,7 @@ public class DemuxManager implements CHU
}
protected void init() throws IOException, URISyntaxException {
- String fsName = conf.get(WRITER_HDFS_FILESYSTEM_FIELD);
+ String fsName = conf.get(HDFS_DEFAULT_NAME_FIELD);
fs = FileSystem.get(new URI(fsName), conf);
}
Modified: hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/demux/PostProcessorManager.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/demux/PostProcessorManager.java?rev=926408&r1=926407&r2=926408&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/demux/PostProcessorManager.java (original)
+++ hadoop/chukwa/branches/chukwa-0.4/src/java/org/apache/hadoop/chukwa/extraction/demux/PostProcessorManager.java Tue Mar 23 00:07:11 2010
@@ -66,7 +66,7 @@ public class PostProcessorManager implem
}
protected void init() throws IOException, URISyntaxException {
- String fsName = conf.get(WRITER_HDFS_FILESYSTEM_FIELD);
+ String fsName = conf.get(HDFS_DEFAULT_NAME_FIELD);
fs = FileSystem.get(new URI(fsName), conf);
}
Modified: hadoop/chukwa/branches/chukwa-0.4/src/test/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.4/src/test/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java?rev=926408&r1=926407&r2=926408&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.4/src/test/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java (original)
+++ hadoop/chukwa/branches/chukwa-0.4/src/test/org/apache/hadoop/chukwa/extraction/demux/TestDemuxManager.java Tue Mar 23 00:07:11 2010
@@ -40,7 +40,7 @@ public class TestDemuxManager extends Te
String tempDirectory = System.getProperty("test.build.data", "/tmp");
String chukwaRootDir = tempDirectory + "/demuxManagerTest_" + System.currentTimeMillis() +"/";
- cc.set(CHUKWA_CONSTANT.WRITER_HDFS_FILESYSTEM_FIELD, "file:///");
+ cc.set(CHUKWA_CONSTANT.HDFS_DEFAULT_NAME_FIELD, "file:///");
cc.set(CHUKWA_CONSTANT.CHUKWA_ROOT_DIR_FIELD, chukwaRootDir );
cc.set(CHUKWA_CONSTANT.CHUKWA_ARCHIVE_DIR_FIELD, chukwaRootDir +"/archives/" );
cc.set(CHUKWA_CONSTANT.CHUKWA_POST_PROCESS_DIR_FIELD, chukwaRootDir +"/postProcess" );
@@ -92,7 +92,7 @@ public class TestDemuxManager extends Te
String tempDirectory = System.getProperty("test.build.data", "/tmp");
String chukwaRootDir = tempDirectory + "/demuxManagerTest_" + System.currentTimeMillis() +"/";
- cc.set(CHUKWA_CONSTANT.WRITER_HDFS_FILESYSTEM_FIELD, "file:///");
+ cc.set(CHUKWA_CONSTANT.HDFS_DEFAULT_NAME_FIELD, "file:///");
cc.set(CHUKWA_CONSTANT.CHUKWA_ROOT_DIR_FIELD, chukwaRootDir );
cc.set(CHUKWA_CONSTANT.CHUKWA_ARCHIVE_DIR_FIELD, chukwaRootDir +"/archives/" );
cc.set(CHUKWA_CONSTANT.CHUKWA_POST_PROCESS_DIR_FIELD, chukwaRootDir +"/postProcess" );
@@ -142,7 +142,7 @@ public class TestDemuxManager extends Te
String tempDirectory = System.getProperty("test.build.data", "/tmp");
String chukwaRootDir = tempDirectory + "/demuxManagerTest_" + System.currentTimeMillis() +"/";
- cc.set(CHUKWA_CONSTANT.WRITER_HDFS_FILESYSTEM_FIELD, "file:///");
+ cc.set(CHUKWA_CONSTANT.HDFS_DEFAULT_NAME_FIELD, "file:///");
cc.set(CHUKWA_CONSTANT.CHUKWA_ROOT_DIR_FIELD, chukwaRootDir );
cc.set(CHUKWA_CONSTANT.CHUKWA_ARCHIVE_DIR_FIELD, chukwaRootDir +"/archives/" );
cc.set(CHUKWA_CONSTANT.CHUKWA_POST_PROCESS_DIR_FIELD, chukwaRootDir +"/postProcess" );
@@ -208,7 +208,7 @@ public class TestDemuxManager extends Te
String tempDirectory = System.getProperty("test.build.data", "/tmp");
String chukwaRootDir = tempDirectory + "/demuxManagerTest_" + System.currentTimeMillis() +"/";
- cc.set(CHUKWA_CONSTANT.WRITER_HDFS_FILESYSTEM_FIELD, "file:///");
+ cc.set(CHUKWA_CONSTANT.HDFS_DEFAULT_NAME_FIELD, "file:///");
cc.set(CHUKWA_CONSTANT.CHUKWA_ROOT_DIR_FIELD, chukwaRootDir );
cc.set(CHUKWA_CONSTANT.CHUKWA_ARCHIVE_DIR_FIELD, chukwaRootDir +"/archives/" );
cc.set(CHUKWA_CONSTANT.CHUKWA_POST_PROCESS_DIR_FIELD, chukwaRootDir +"/postProcess" );
@@ -275,7 +275,7 @@ public class TestDemuxManager extends Te
String tempDirectory = System.getProperty("test.build.data", "/tmp");
String chukwaRootDir = tempDirectory + "/demuxManagerTest_" + System.currentTimeMillis() +"/";
- cc.set(CHUKWA_CONSTANT.WRITER_HDFS_FILESYSTEM_FIELD, "file:///");
+ cc.set(CHUKWA_CONSTANT.HDFS_DEFAULT_NAME_FIELD, "file:///");
cc.set(CHUKWA_CONSTANT.CHUKWA_ROOT_DIR_FIELD, chukwaRootDir );
cc.set(CHUKWA_CONSTANT.CHUKWA_ARCHIVE_DIR_FIELD, chukwaRootDir +"/archives/" );
cc.set(CHUKWA_CONSTANT.CHUKWA_POST_PROCESS_DIR_FIELD, chukwaRootDir +"/postProcess" );