From 3a28e1f9d9e4bc9f2c894954c9d68ed1bbcda502 Mon Sep 17 00:00:00 2001 From: Prabhu Joseph Date: Thu, 28 Mar 2019 21:30:12 +0530 Subject: [PATCH] YARN-9418 --- .../server/nodemanager/timelineservice/NMTimelinePublisher.java | 8 ++------ .../resourcemanager/metrics/TimelineServiceV2Publisher.java | 2 ++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java index 79443f4..b2d9376 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java @@ -186,8 +186,6 @@ public void reportContainerResourceUsage(Container container, Long pmemUsage, Math.round(cpuUsagePercentPerCore)); entity.addMetric(cpuMetric); } - entity.setIdPrefix(TimelineServiceHelper. - invertLong(container.getContainerStartTime())); ApplicationId appId = container.getContainerId(). getApplicationAttemptId().getApplicationId(); try { @@ -249,7 +247,6 @@ private void publishContainerCreatedEvent(ContainerEvent event) { long containerStartTime = container.getContainerStartTime(); entity.addEvent(tEvent); entity.setCreatedTime(containerStartTime); - entity.setIdPrefix(TimelineServiceHelper.invertLong(containerStartTime)); dispatcher.getEventHandler().handle(new TimelinePublishEvent(entity, containerId.getApplicationAttemptId().getApplicationId())); } @@ -277,7 +274,6 @@ private void publishContainerFinishedEvent(ContainerStatus containerStatus, tEvent.setId(ContainerMetricsConstants.FINISHED_EVENT_TYPE); tEvent.setTimestamp(containerFinishTime); entity.addEvent(tEvent); - entity.setIdPrefix(TimelineServiceHelper.invertLong(containerStartTime)); dispatcher.getEventHandler().handle(new TimelinePublishEvent(entity, containerId.getApplicationAttemptId().getApplicationId())); @@ -295,8 +291,6 @@ private void publishContainerLocalizationEvent( tEvent.setId(eventType); tEvent.setTimestamp(event.getTimestamp()); entity.addEvent(tEvent); - entity.setIdPrefix(TimelineServiceHelper. - invertLong(container.getContainerStartTime())); ApplicationId appId = container.getContainerId(). getApplicationAttemptId().getApplicationId(); @@ -328,6 +322,8 @@ private static ContainerEntity createContainerEntity( ContainerId containerId) { ContainerEntity entity = new ContainerEntity(); entity.setId(containerId.toString()); + entity.setIdPrefix(TimelineServiceHelper.invertLong( + containerId.getContainerId())); Identifier parentIdentifier = new Identifier(); parentIdentifier .setType(TimelineEntityType.YARN_APPLICATION_ATTEMPT.name()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java index 71f88a4..1438e25 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java @@ -458,6 +458,8 @@ private static ContainerEntity createContainerEntity( ContainerId containerId) { ContainerEntity entity = new ContainerEntity(); entity.setId(containerId.toString()); + entity.setIdPrefix(TimelineServiceHelper.invertLong( + containerId.getContainerId())); entity.setParent(new Identifier(TimelineEntityType.YARN_APPLICATION_ATTEMPT .name(), containerId.getApplicationAttemptId().toString())); return entity; -- 2.7.4 (Apple Git-66)