tez git commit: TEZ-2995. Timeline primary filter should only be on callerId and not type. (hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.7 1db5d1878 -> 3e30e9498


TEZ-2995. Timeline primary filter should only be on callerId and not type. 
(hitesh)

(cherry picked from commit a34f109650f633a06320238c08884b5817225085)

Conflicts:
        CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/3e30e949
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/3e30e949
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/3e30e949

Branch: refs/heads/branch-0.7
Commit: 3e30e949821ef7e07cd34fd95a0355116deddc2e
Parents: 1db5d18
Author: Hitesh Shah <hit...@apache.org>
Authored: Fri Dec 11 20:30:16 2015 -0800
Committer: Hitesh Shah <hit...@apache.org>
Committed: Fri Dec 11 20:31:58 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 .../dag/history/logging/ats/HistoryEventTimelineConversion.java | 5 +----
 .../history/logging/ats/TestHistoryEventTimelineConversion.java | 5 +----
 3 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/3e30e949/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index aced775..60ea352 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ INCOMPATIBLE CHANGES
   TEZ-2949. Allow duplicate dag names within session for Tez.
 
 ALL CHANGES
+  TEZ-2995. Timeline primary filter should only be on callerId and not type.
   TEZ-2943. Change shuffle vertex manager to use per vertex data for auto
   reduce and slow start
   TEZ-2956. Handle auto-reduce parallelism when the

http://git-wip-us.apache.org/repos/asf/tez/blob/3e30e949/tez-plugins/tez-yarn-timeline-history/src/main/java/org/apache/tez/dag/history/logging/ats/HistoryEventTimelineConversion.java
----------------------------------------------------------------------
diff --git 
a/tez-plugins/tez-yarn-timeline-history/src/main/java/org/apache/tez/dag/history/logging/ats/HistoryEventTimelineConversion.java
 
b/tez-plugins/tez-yarn-timeline-history/src/main/java/org/apache/tez/dag/history/logging/ats/HistoryEventTimelineConversion.java
index 0d6cbcb..0fd962f 100644
--- 
a/tez-plugins/tez-yarn-timeline-history/src/main/java/org/apache/tez/dag/history/logging/ats/HistoryEventTimelineConversion.java
+++ 
b/tez-plugins/tez-yarn-timeline-history/src/main/java/org/apache/tez/dag/history/logging/ats/HistoryEventTimelineConversion.java
@@ -392,12 +392,9 @@ public class HistoryEventTimelineConversion {
         event.getDagID().getApplicationId().toString());
 
     if (event.getDAGPlan().hasCallerContext()
-        && event.getDAGPlan().getCallerContext().hasCallerId()
-        && event.getDAGPlan().getCallerContext().hasCallerType()) {
+        && event.getDAGPlan().getCallerContext().hasCallerId()) {
       atsEntity.addPrimaryFilter(ATSConstants.CALLER_CONTEXT_ID,
           event.getDAGPlan().getCallerContext().getCallerId());
-      atsEntity.addPrimaryFilter(ATSConstants.CALLER_CONTEXT_TYPE,
-          event.getDAGPlan().getCallerContext().getCallerType());
     }
 
     try {

http://git-wip-us.apache.org/repos/asf/tez/blob/3e30e949/tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestHistoryEventTimelineConversion.java
----------------------------------------------------------------------
diff --git 
a/tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestHistoryEventTimelineConversion.java
 
b/tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestHistoryEventTimelineConversion.java
index 3a56f17..38ccf65 100644
--- 
a/tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestHistoryEventTimelineConversion.java
+++ 
b/tez-plugins/tez-yarn-timeline-history/src/test/java/org/apache/tez/dag/history/logging/ats/TestHistoryEventTimelineConversion.java
@@ -460,7 +460,7 @@ public class TestHistoryEventTimelineConversion {
 
     Assert.assertEquals(submitTime, timelineEntity.getStartTime().longValue());
 
-    Assert.assertEquals(5, timelineEntity.getPrimaryFilters().size());
+    Assert.assertEquals(4, timelineEntity.getPrimaryFilters().size());
 
     Assert.assertTrue(
         timelineEntity.getPrimaryFilters().get(ATSConstants.DAG_NAME).contains(
@@ -469,9 +469,6 @@ public class TestHistoryEventTimelineConversion {
         
timelineEntity.getPrimaryFilters().get(ATSConstants.CALLER_CONTEXT_ID).contains(
             dagPlan.getCallerContext().getCallerId()));
     Assert.assertTrue(
-        
timelineEntity.getPrimaryFilters().get(ATSConstants.CALLER_CONTEXT_TYPE).contains(
-            dagPlan.getCallerContext().getCallerType()));
-    Assert.assertTrue(
         
timelineEntity.getPrimaryFilters().get(ATSConstants.APPLICATION_ID).contains(
             applicationAttemptId.getApplicationId().toString()));
     Assert.assertTrue(