You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2013/10/03 06:26:05 UTC
svn commit: r1528710 -
/pig/branches/branch-0.12/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java
Author: daijy
Date: Thu Oct 3 04:26:05 2013
New Revision: 1528710
URL: http://svn.apache.org/r1528710
Log:
PIG-3360: Some intermittent negative e2e tests fail on hadoop 2
Modified:
pig/branches/branch-0.12/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java
Modified: pig/branches/branch-0.12/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.12/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java?rev=1528710&r1=1528709&r2=1528710&view=diff
==============================================================================
--- pig/branches/branch-0.12/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java (original)
+++ pig/branches/branch-0.12/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java Thu Oct 3 04:26:05 2013
@@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobID;
import org.apache.hadoop.mapred.RunningJob;
+import org.apache.hadoop.mapred.TIPStatus;
import org.apache.hadoop.mapred.TaskReport;
import org.apache.hadoop.mapred.jobcontrol.Job;
import org.apache.hadoop.mapred.jobcontrol.JobControl;
@@ -39,6 +40,7 @@ import org.apache.pig.FuncSpec;
import org.apache.pig.PigException;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
+import org.apache.pig.backend.hadoop.executionengine.shims.HadoopShims;
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.plan.PlanException;
import org.apache.pig.impl.plan.VisitorException;
@@ -180,12 +182,8 @@ public abstract class Launcher {
ArrayList<Exception> exceptions = new ArrayList<Exception>();
String exceptionCreateFailMsg = null;
boolean jobFailed = false;
- float successfulProgress = 1.0f;
if (msgs.length > 0) {
- //if the progress reported is not 1.0f then the map or reduce job failed
- //this comparison is in place till Hadoop 0.20 provides methods to query
- //job status
- if(reports[i].getProgress() != successfulProgress) {
+ if (HadoopShims.isJobFailed(reports[i])) {
jobFailed = true;
}
Set<String> errorMessageSet = new HashSet<String>();
@@ -213,7 +211,7 @@ public abstract class Launcher {
}
}
//if there are no valid exception that could be created, report
- if((exceptions.size() == 0) && (exceptionCreateFailMsg != null)){
+ if(jobFailed && (exceptions.size() == 0) && (exceptionCreateFailMsg != null)){
int errCode = 2997;
String msg = "Unable to recreate exception from backed error: "+exceptionCreateFailMsg;
throw new ExecException(msg, errCode, PigException.BUG);