tez git commit: TEZ-3329. Tez ATS data is incomplete for a vertex which fails or gets killed before initialization (sree)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.8 aeae7c97b -> 62dd11ed0


TEZ-3329. Tez ATS data is incomplete for a vertex which fails or gets killed 
before initialization (sree)

(cherry picked from commit 5affb3f5487a5446d13f69406c46f77e53976c49)

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/62dd11ed
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/62dd11ed
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/62dd11ed

Branch: refs/heads/branch-0.8
Commit: 62dd11ed054ddf0599433bdfc4b0976882d67327
Parents: aeae7c9
Author: Sreenath Somarajapuram <s...@apache.org>
Authored: Fri Jul 8 15:17:57 2016 +0530
Committer: Hitesh Shah <hit...@apache.org>
Committed: Mon Jul 18 15:54:22 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/tez/blob/62dd11ed/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9e8c0e3..8684efa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3329. Tez ATS data is incomplete for a vertex which fails or gets killed 
before initialization.
   TEZ-3235. Modify Example TestOrderedWordCount job to test the IPC limit for 
large dag plans.
   TEZ-3337. Do not log empty fields of TaskAttemptFinishedEvent to avoid 
confusion.
   TEZ-1248. Reduce slow-start should special case 1 reducer runs.

http://git-wip-us.apache.org/repos/asf/tez/blob/62dd11ed/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 62f0937..96239c3 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
@@ -610,6 +610,7 @@ public class HistoryEventTimelineConversion {
 
     atsEntity.addPrimaryFilter(ATSConstants.STATUS, event.getState().name());
 
+    atsEntity.addOtherInfo(ATSConstants.VERTEX_NAME, event.getVertexName());
     atsEntity.addOtherInfo(ATSConstants.FINISH_TIME, event.getFinishTime());
     atsEntity.addOtherInfo(ATSConstants.TIME_TAKEN, (event.getFinishTime() - 
event.getStartTime()));
     atsEntity.addOtherInfo(ATSConstants.STATUS, event.getState().name());

http://git-wip-us.apache.org/repos/asf/tez/blob/62dd11ed/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 f622056..dabd6a5 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
@@ -785,6 +785,7 @@ public class TestHistoryEventTimelineConversion {
   @SuppressWarnings("unchecked")
   @Test(timeout = 5000)
   public void testConvertVertexFinishedEvent() {
+    String vertexName = "v1";
     long initRequestedTime = random.nextLong();
     long initedTime = random.nextLong();
     long startRequestedTime = random.nextLong();
@@ -795,7 +796,7 @@ public class TestHistoryEventTimelineConversion {
     taskStats.put("BAR", 200);
     VertexStats vertexStats = new VertexStats();
 
-    VertexFinishedEvent event = new VertexFinishedEvent(tezVertexID, "v1", 1, 
initRequestedTime,
+    VertexFinishedEvent event = new VertexFinishedEvent(tezVertexID, 
vertexName, 1, initRequestedTime,
         initedTime, startRequestedTime, startTime, finishTime, 
VertexState.ERROR,
         "diagnostics", null, vertexStats, taskStats,
         new ServicePluginInfo().setContainerLauncherName("abc")
@@ -825,6 +826,8 @@ public class TestHistoryEventTimelineConversion {
     Assert.assertEquals(HistoryEventType.VERTEX_FINISHED.name(), 
timelineEvent.getEventType());
     Assert.assertEquals(finishTime, timelineEvent.getTimestamp());
 
+    Assert.assertEquals(vertexName,
+        timelineEntity.getOtherInfo().get(ATSConstants.VERTEX_NAME));
     Assert.assertEquals(finishTime,
         ((Long) 
timelineEntity.getOtherInfo().get(ATSConstants.FINISH_TIME)).longValue());
     Assert.assertEquals(finishTime - startTime,