Author: acmurthy
Date: Sat Apr 6 05:33:41 2013
New Revision: 1465189
URL: http://svn.apache.org/r1465189
Log:
Merge -c 1465188 from trunk to branch-2 to fix MAPREDUCE-5129. Allow tags to
JobHistory for deeper analytics. Contributed by Billie Rinaldi.
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java
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=1465189&r1=1465188&r2=1465189&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
Sat Apr 6 05:33:41 2013
@@ -92,6 +92,10 @@ public class Job20LineHistoryEventEmitte
if (workflowAdjacencies == null) {
workflowAdjacencies = "";
}
+ String workflowTags = line.get("WORKFLOW_TAGS");
+ if (workflowTags == null) {
+ workflowTags = "";
+ }
if (submitTime != null) {
@@ -104,7 +108,8 @@ public class Job20LineHistoryEventEmitte
new HashMap<JobACL, AccessControlList>();
return new JobSubmittedEvent(jobID, jobName, user,
that.originalSubmitTime, jobConf, jobACLs, jobQueueName,
- workflowId, workflowName, workflowNodeName, workflowAdjacencies);
+ workflowId, workflowName, workflowNodeName, workflowAdjacencies,
+ workflowTags);
}
return null;