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 da...@apache.org on 2013/06/11 21:35:27 UTC

svn commit: r1491921 - /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java

Author: daryn
Date: Tue Jun 11 19:35:26 2013
New Revision: 1491921

URL: http://svn.apache.org/r1491921
Log:
svn merge -c 1491914 FIXES: MAPREDUCE-5315.  DistCp reports success even on failure. (mithun and jlowe via daryn)

Modified:
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java

Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java?rev=1491921&r1=1491920&r2=1491921&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java Tue Jun 11 19:35:26 2013
@@ -157,8 +157,9 @@ public class DistCp extends Configured i
     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;
   }