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

svn merge -c 1491914 FIXES: MAPREDUCE-5315. DistCp reports success even on failure. (mithun and jlowe via daryn) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491918 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daryn Sharp 2013-06-11 19:30:44 +00:00
parent 05ff189ee1
commit 45ca24c1d8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,6 +392,9 @@ Release 2.1.0-beta - UNRELEASED
MAPREDUCE-5308. Shuffling to memory can get out-of-sync when fetching
multiple compressed map outputs (Nathan Roberts via jlowe)
MAPREDUCE-5315. DistCp reports success even on failure. (mithun and jlowe
via daryn)
BREAKDOWN OF HADOOP-8562 SUBTASKS
MAPREDUCE-4739. Some MapReduce tests fail to find winutils.
@ -1010,6 +1013,9 @@ Release 0.23.9 - UNRELEASED
MAPREDUCE-5308. Shuffling to memory can get out-of-sync when fetching
multiple compressed map outputs (Nathan Roberts via jlowe)
MAPREDUCE-5315. DistCp reports success even on failure. (mithun and jlowe
via daryn)
Release 0.23.8 - 2013-06-05
INCOMPATIBLE CHANGES

5
hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
View File

@ -162,8 +162,9 @@ public class DistCp extends Configured implements Tool {
job.getConfiguration().set(DistCpConstants.CONF_LABEL_DISTCP_JOB_ID, jobID);
LOG.info("DistCp job-id: " + jobID);
if (inputOptions.shouldBlock()) {
job.waitForCompletion(true);
if (inputOptions.shouldBlock() && !job.waitForCompletion(true)) {
throw new IOException("DistCp failure: Job " + jobID + " has failed: "
+ job.getStatus().getFailureInfo());
}
return job;
}