Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -c 1186458 from trunk to branch-0.23 to complete fix for MAPREDUCE-3181. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186459 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-10-19 20:28:49 +00:00
parent 3b39b29b9c
commit cad9bc8843
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -1635,6 +1635,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3176. Fixed ant mapreduce tests that are timing out because
of wrong framework name. (Hitesh Shah via vinodkv)
MAPREDUCE-3181. Fixed MapReduce runtime to load yarn-default.xml and
yarn-site.xml. (acmurthy)
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
View File

@ -40,6 +40,8 @@ public class ConfigUtil {
addDeprecatedKeys();
Configuration.addDefaultResource("mapred-default.xml");
Configuration.addDefaultResource("mapred-site.xml");
Configuration.addDefaultResource("yarn-default.xml");
Configuration.addDefaultResource("yarn-site.xml");
}
/**

22
hadoop-mapreduce-project/src/examples/org/apache/hadoop/examples/terasort/TeraOutputFormat.java
View File

@ -29,7 +29,6 @@ import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.OutputCommitter;
import org.apache.hadoop.mapreduce.RecordWriter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.TaskType;
import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
@ -100,28 +99,9 @@ public class TeraOutputFormat extends FileOutputFormat<Text,Text> {
throws IOException {
if (committer == null) {
Path output = getOutputPath(context);
committer = new TeraOutputCommitter(output, context);
committer = new FileOutputCommitter(output, context);
}
return committer;
}
public static class TeraOutputCommitter extends FileOutputCommitter {
public TeraOutputCommitter(Path outputPath, TaskAttemptContext context)
throws IOException {
super(outputPath, context);
}
@Override
public void commitJob(JobContext jobContext) {
}
@Override
public void setupJob(JobContext jobContext) {
}
@Override
public void setupTask(TaskAttemptContext taskContext) {
}
}
}