Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CCE13200B38 for ; Fri, 8 Jul 2016 11:47:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CB798160A5A; Fri, 8 Jul 2016 09:47:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1F40A160A58 for ; Fri, 8 Jul 2016 11:47:25 +0200 (CEST) Received: (qmail 41022 invoked by uid 500); 8 Jul 2016 09:47:25 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 41013 invoked by uid 99); 8 Jul 2016 09:47:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jul 2016 09:47:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0965DDFFF8; Fri, 8 Jul 2016 09:47:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sree@apache.org To: commits@tez.apache.org Message-Id: <3b01ae120e3d476b8dd71661922b70db@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tez git commit: TEZ-3329. Tez ATS data is incomplete for a vertex which fails or gets killed before initialization (sree) Date: Fri, 8 Jul 2016 09:47:25 +0000 (UTC) archived-at: Fri, 08 Jul 2016 09:47:27 -0000 Repository: tez Updated Branches: refs/heads/master bcdef6605 -> 5affb3f54 TEZ-3329. Tez ATS data is incomplete for a vertex which fails or gets killed before initialization (sree) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/5affb3f5 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/5affb3f5 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/5affb3f5 Branch: refs/heads/master Commit: 5affb3f5487a5446d13f69406c46f77e53976c49 Parents: bcdef66 Author: Sreenath Somarajapuram Authored: Fri Jul 8 15:17:57 2016 +0530 Committer: Sreenath Somarajapuram Committed: Fri Jul 8 15:17:57 2016 +0530 ---------------------------------------------------------------------- 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/5affb3f5/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 02334b4..a9c4e35 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -70,6 +70,7 @@ ALL CHANGES: TEZ-3292. Tez UI: UTs breaking with timezone change TEZ-3288. Tez UI: Display more details in the error bar TEZ-3318. Tez UI: Polling is not restarted after RM recovery + TEZ-3329. Tez ATS data is incomplete for a vertex which fails or gets killed before initialization Release 0.8.5: Unreleased http://git-wip-us.apache.org/repos/asf/tez/blob/5affb3f5/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/5affb3f5/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,