You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ac...@apache.org on 2012/03/29 09:53:06 UTC
svn commit: r1306744 - in /hadoop/common/branches/branch-1.0: CHANGES.txt
build.xml src/mapred/org/apache/hadoop/mapred/JobClient.java
src/test/org/apache/hadoop/mapreduce/TestMROutputFormat.java
Author: acmurthy
Date: Thu Mar 29 07:53:05 2012
New Revision: 1306744
URL: http://svn.apache.org/viewvc?rev=1306744&view=rev
Log:
Merge -c 1306741 from branch-1 to branch-1.0 to fix MAPREDUCE-3377. Ensure OutputCommitter.checkOutputSpecs is called prior to copying job.xml.
Added:
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/TestMROutputFormat.java
- copied unchanged from r1306741, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/TestMROutputFormat.java
Modified:
hadoop/common/branches/branch-1.0/CHANGES.txt
hadoop/common/branches/branch-1.0/build.xml
hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapred/JobClient.java
Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1306744&r1=1306743&r2=1306744&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Thu Mar 29 07:53:05 2012
@@ -22,6 +22,9 @@ Release 1.0.3 - unreleased
HDFS-3127. Do not throw exceptions when FSImage.restoreStorageDirs() failes.
(Brandon Li via szetszwo)
+ MAPREDUCE-3377. Ensure OutputCommitter.checkOutputSpecs is called prior to
+ copying job.xml. (Jane Chen via acmurthy)
+
Release 1.0.2 - 2012.03.24
NEW FEATURES
Modified: hadoop/common/branches/branch-1.0/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/build.xml?rev=1306744&r1=1306743&r2=1306744&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/build.xml (original)
+++ hadoop/common/branches/branch-1.0/build.xml Thu Mar 29 07:53:05 2012
@@ -1592,14 +1592,6 @@
<copy todir="${dist.dir}/" file="build.xml"/>
- <subant target="task-controller">
- <fileset dir="." includes="build.xml"/>
- </subant>
-
- <subant target="jsvc">
- <fileset dir="." includes="build.xml"/>
- </subant>
-
<chmod perm="ugo+x" type="file" parallel="false">
<fileset dir="${dist.dir}/bin"/>
<fileset dir="${dist.dir}/sbin"/>
@@ -1768,14 +1760,6 @@
</fileset>
</copy>
- <subant target="task-controller">
- <fileset dir="." includes="build.xml"/>
- </subant>
-
- <subant target="jsvc">
- <fileset dir="." includes="build.xml"/>
- </subant>
-
<chmod perm="ugo+x" type="file" parallel="false">
<fileset dir="${dist.dir}/bin"/>
<fileset dir="${dist.dir}/libexec"/>
Modified: hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapred/JobClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapred/JobClient.java?rev=1306744&r1=1306743&r2=1306744&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapred/JobClient.java (original)
+++ hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapred/JobClient.java Thu Mar 29 07:53:05 2012
@@ -878,8 +878,6 @@ public class JobClient extends Configure
}
JobContext context = new JobContext(jobCopy, jobId);
- jobCopy = (JobConf)context.getConfiguration();
-
// Check the output specification
if (reduces == 0 ? jobCopy.getUseNewMapper() :
jobCopy.getUseNewReducer()) {
@@ -890,6 +888,8 @@ public class JobClient extends Configure
} else {
jobCopy.getOutputFormat().checkOutputSpecs(fs, jobCopy);
}
+
+ jobCopy = (JobConf)context.getConfiguration();
// Create the splits for the job
FileSystem fs = submitJobDir.getFileSystem(jobCopy);