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 ac...@apache.org on 2011/10/19 22:28:12 UTC
svn commit: r1186458 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/
src/examples/org/apache/hadoop/examples/terasort/
Author: acmurthy
Date: Wed Oct 19 20:28:11 2011
New Revision: 1186458
URL: http://svn.apache.org/viewvc?rev=1186458&view=rev
Log:
MAPREDUCE-3181. Fixed MapReduce runtime to load yarn-default.xml and yarn-site.xml.
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
hadoop/common/trunk/hadoop-mapreduce-project/src/examples/org/apache/hadoop/examples/terasort/TeraOutputFormat.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1186458&r1=1186457&r2=1186458&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Oct 19 20:28:11 2011
@@ -1686,6 +1686,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
Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java?rev=1186458&r1=1186457&r2=1186458&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java Wed Oct 19 20:28:11 2011
@@ -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");
}
/**
Modified: hadoop/common/trunk/hadoop-mapreduce-project/src/examples/org/apache/hadoop/examples/terasort/TeraOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/examples/org/apache/hadoop/examples/terasort/TeraOutputFormat.java?rev=1186458&r1=1186457&r2=1186458&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/src/examples/org/apache/hadoop/examples/terasort/TeraOutputFormat.java (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/src/examples/org/apache/hadoop/examples/terasort/TeraOutputFormat.java Wed Oct 19 20:28:11 2011
@@ -29,7 +29,6 @@ import org.apache.hadoop.mapreduce.JobCo
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 Fi
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) {
- }
- }
}