You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by cd...@apache.org on 2010/02/13 12:26:25 UTC
svn commit: r909793 - in /hadoop/mapreduce/trunk: CHANGES.txt
src/java/org/apache/hadoop/mapred/JobConf.java
src/java/org/apache/hadoop/mapred/TaskController.java
src/java/org/apache/hadoop/mapred/TaskRunner.java
Author: cdouglas
Date: Sat Feb 13 11:26:25 2010
New Revision: 909793
URL: http://svn.apache.org/viewvc?rev=909793&view=rev
Log:
MAPREDUCE-1441. Trim whitespace from directory lists pulled from the configuration. Contributed by Todd Lipcon
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobConf.java
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskController.java
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=909793&r1=909792&r2=909793&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Sat Feb 13 11:26:25 2010
@@ -171,6 +171,9 @@
MAPREDUCE-1425. Reduce memory usage by archive. (mahadev via szetszwo)
+ MAPREDUCE-1441. Trim whitespace from directory lists pulled from the
+ configuration. (Todd Lipcon via cdouglas)
+
OPTIMIZATIONS
MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobConf.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobConf.java?rev=909793&r1=909792&r2=909793&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobConf.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobConf.java Sat Feb 13 11:26:25 2010
@@ -445,7 +445,7 @@
}
public String[] getLocalDirs() throws IOException {
- return getStrings(MRConfig.LOCAL_DIR);
+ return getTrimmedStrings(MRConfig.LOCAL_DIR);
}
/**
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskController.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskController.java?rev=909793&r1=909792&r2=909793&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskController.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskController.java Sat Feb 13 11:26:25 2010
@@ -64,7 +64,7 @@
public void setConf(Configuration conf) {
this.conf = conf;
- mapredLocalDirs = conf.getStrings(MRConfig.LOCAL_DIR);
+ mapredLocalDirs = conf.getTrimmedStrings(MRConfig.LOCAL_DIR);
}
/**
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java?rev=909793&r1=909792&r2=909793&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java Sat Feb 13 11:26:25 2010
@@ -598,7 +598,7 @@
* process space.
*/
static void setupChildMapredLocalDirs(Task t, JobConf conf) {
- String[] localDirs = conf.getStrings(MRConfig.LOCAL_DIR);
+ String[] localDirs = conf.getTrimmedStrings(MRConfig.LOCAL_DIR);
String jobId = t.getJobID().toString();
String taskId = t.getTaskID().toString();
boolean isCleanup = t.isTaskCleanupTask();