Repository: tez Updated Branches: refs/heads/master bf41f19ab -> a34f10965
TEZ-2995. Timeline primary filter should only be on callerId and not type. (hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/a34f1096 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/a34f1096 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/a34f1096 Branch: refs/heads/master Commit: a34f109650f633a06320238c08884b5817225085 Parents: bf41f19 Author: Hitesh Shah <[email protected]> Authored: Fri Dec 11 20:30:16 2015 -0800 Committer: Hitesh Shah <[email protected]> Committed: Fri Dec 11 20:30:16 2015 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../dag/history/logging/ats/HistoryEventTimelineConversion.java | 5 +---- .../history/logging/ats/TestHistoryEventTimelineConversion.java | 5 +---- 3 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/a34f1096/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1d9debf..0df79bc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,7 @@ INCOMPATIBLE CHANGES TEZ-604. Revert temporary changes made in TEZ-603 to kill the provided tez session, if running a MapReduce job. ALL CHANGES: + TEZ-2995. Timeline primary filter should only be on callerId and not type. TEZ-2994. LocalProgress in tez-runtime-library missing Apache header, rat check warnings from the new licenses after TEZ-2592 merge. TEZ-2977. Make HadoopShim selection be overridable for distro-specific implementations. TEZ-2472. Change slf4j version to 1.7.10. @@ -289,6 +290,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-2824. Add javadocs for Vertex.setConf and DAG.setConf. TEZ-2963. RecoveryService#handleSummaryEvent exception with HDFS transparent encryption + kerberos authentication. TEZ-2966. Tez does not honor mapreduce.task.timeout http://git-wip-us.apache.org/repos/asf/tez/blob/a34f1096/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 7082ca7..afb7650 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 @@ -391,12 +391,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/a34f1096/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 7792c62..2350bf0 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 @@ -459,7 +459,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( @@ -468,9 +468,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(
