You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by dv...@apache.org on 2012/02/16 01:48:49 UTC
svn commit: r1244811 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
Author: dvryaboy
Date: Thu Feb 16 00:48:48 2012
New Revision: 1244811
URL: http://svn.apache.org/viewvc?rev=1244811&view=rev
Log:
PIG-2533: Pig MR job exceptions masked on frontend
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1244811&r1=1244810&r2=1244811&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Feb 16 00:48:48 2012
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-2533: Pig MR job exceptions masked on frontend (traviscrawford via dvryaboy)
+
PIG-2525: Support pluggable PigProcessNotifcationListeners on the command line (dvryaboy)
PIG-2515: [piggybank] Make CustomFormatToISO return null on Exception in parsing dates (rjurney via dvryaboy)
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java?rev=1244811&r1=1244810&r2=1244811&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/Launcher.java Thu Feb 16 00:48:48 2012
@@ -138,10 +138,8 @@ public abstract class Launcher {
log);
backendException = getExceptionFromString(jobMessage);
} catch (Exception e) {
- //just get the first line in the message and log the rest
- String firstLine = getFirstLineFromMessage(jobMessage);
int errCode = 2997;
- String msg = "Unable to recreate exception from backend error: " + firstLine;
+ String msg = "Unable to recreate exception from backend error: " + jobMessage;
throw new ExecException(msg, errCode, PigException.BUG);
}
throw backendException;
@@ -202,9 +200,7 @@ public abstract class Launcher {
Exception e = getExceptionFromString(msgs[j]);
exceptions.add(e);
} catch (Exception e1) {
- // keep track of the exception we were unable to re-create
- String firstLine = getFirstLineFromMessage(msgs[j]);
- exceptionCreateFailMsg = firstLine;
+ exceptionCreateFailMsg = msgs[j];
}
} else {
@@ -573,15 +569,5 @@ public abstract class Launcher {
}
return new StackTraceElement(declaringClass, methodName, fileName, lineNumber);
}
-
- protected String getFirstLineFromMessage(String message) {
- String[] messages = message.split(newLine);
- if(messages.length > 0) {
- return messages[0];
- } else {
- return message;
- }
- }
-
}
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java?rev=1244811&r1=1244810&r2=1244811&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java Thu Feb 16 00:48:48 2012
@@ -321,7 +321,7 @@ public class MapReduceLauncher extends L
for (int i=0; i<jc.getFailedJobs().size(); i++) {
Job j = jc.getFailedJobs().get(i);
- msg.append(getFirstLineFromMessage(j.getMessage()));
+ msg.append(j.getMessage());
if (i!=jc.getFailedJobs().size()-1) {
msg.append("\n");
}
@@ -617,7 +617,7 @@ public class MapReduceLauncher extends L
jobControlException = getExceptionFromString(jobControlExceptionStackTrace);
} catch (Exception e) {
String errMsg = "Could not resolve error that occured when launching map reduce job: "
- + getFirstLineFromMessage(jobControlExceptionStackTrace);
+ + jobControlExceptionStackTrace;
jobControlException = new RuntimeException(errMsg);
}
}