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 ss...@apache.org on 2013/01/29 01:23:29 UTC
svn commit: r1439715 - in
/hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen:
Hadoop20JHParser.java Job20LineHistoryEventEmitter.java
TaskAttempt20LineEventEmitter.java
Author: sseth
Date: Tue Jan 29 00:23:27 2013
New Revision: 1439715
URL: http://svn.apache.org/viewvc?rev=1439715&view=rev
Log:
merge MAPREDUCE-4838 from trunk. Add additional fields like Locality, Avataar to the JobHistory logs. Contributed by Zhijie Shen
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java?rev=1439715&r1=1439714&r2=1439715&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java Tue Jan 29 00:23:27 2013
@@ -67,6 +67,11 @@ public class Hadoop20JHParser implements
reader = new LineReader(input);
}
+ public Hadoop20JHParser(LineReader reader) throws IOException {
+ super();
+ this.reader = reader;
+ }
+
Map<String, HistoryEventEmitter> liveEmitters =
new HashMap<String, HistoryEventEmitter>();
Queue<HistoryEvent> remainingEvents = new LinkedList<HistoryEvent>();
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java?rev=1439715&r1=1439714&r2=1439715&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java Tue Jan 29 00:23:27 2013
@@ -76,6 +76,23 @@ public class Job20LineHistoryEventEmitte
}
String jobName = line.get("JOBNAME");
String jobQueueName = line.get("JOB_QUEUE");// could be null
+ String workflowId = line.get("WORKFLOW_ID");
+ if (workflowId == null) {
+ workflowId = "";
+ }
+ String workflowName = line.get("WORKFLOW_NAME");
+ if (workflowName == null) {
+ workflowName = "";
+ }
+ String workflowNodeName = line.get("WORKFLOW_NODE_NAME");
+ if (workflowNodeName == null) {
+ workflowNodeName = "";
+ }
+ String workflowAdjacencies = line.get("WORKFLOW_ADJACENCIES");
+ if (workflowAdjacencies == null) {
+ workflowAdjacencies = "";
+ }
+
if (submitTime != null) {
Job20LineHistoryEventEmitter that =
@@ -86,7 +103,8 @@ public class Job20LineHistoryEventEmitte
Map<JobACL, AccessControlList> jobACLs =
new HashMap<JobACL, AccessControlList>();
return new JobSubmittedEvent(jobID, jobName, user,
- that.originalSubmitTime, jobConf, jobACLs, jobQueueName);
+ that.originalSubmitTime, jobConf, jobACLs, jobQueueName,
+ workflowId, workflowName, workflowNodeName, workflowAdjacencies);
}
return null;
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java?rev=1439715&r1=1439714&r2=1439715&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java Tue Jan 29 00:23:27 2013
@@ -65,6 +65,14 @@ public abstract class TaskAttempt20LineE
String taskType = line.get("TASK_TYPE");
String trackerName = line.get("TRACKER_NAME");
String httpPort = line.get("HTTP_PORT");
+ String locality = line.get("LOCALITY");
+ if (locality == null) {
+ locality = "";
+ }
+ String avataar = line.get("AVATAAR");
+ if (avataar == null) {
+ avataar = "";
+ }
if (startTime != null && taskType != null) {
TaskAttempt20LineEventEmitter that =
@@ -79,7 +87,8 @@ public abstract class TaskAttempt20LineE
.parseInt(httpPort);
return new TaskAttemptStartedEvent(taskAttemptID,
- that.originalTaskType, that.originalStartTime, trackerName, port, -1);
+ that.originalTaskType, that.originalStartTime, trackerName, port, -1,
+ locality, avataar);
}
return null;