diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java index 84d4543..909c7b4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java @@ -351,6 +351,7 @@ private static ApplicationReportExt convertToApplicationReport( } } List events = entity.getEvents(); + long updatedTimeStamp = 0l; if (events != null) { for (TimelineEvent event : events) { if (event.getEventType().equals( @@ -358,9 +359,16 @@ private static ApplicationReportExt convertToApplicationReport( createdTime = event.getTimestamp(); } else if (event.getEventType().equals( ApplicationMetricsConstants.UPDATED_EVENT_TYPE)) { - // TODO: YARN-5101. This type of events are parsed in - // time-stamp descending order which means the previous event - // could override the information from the later same type of event. + // This type of events are parsed in time-stamp descending order + // which means the previous event could override the information + // from the later same type of event. Hence compare timestamp + // before over writing. + if (event.getTimestamp() > updatedTimeStamp) { + updatedTimeStamp = event.getTimestamp(); + } else { + continue; + } + Map eventInfo = event.getEventInfo(); if (eventInfo == null) { continue; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerOnTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerOnTimelineStore.java index b65b22b..55aa81b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerOnTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerOnTimelineStore.java @@ -551,23 +551,24 @@ private static TimelineEntity createApplicationTimelineEntity( entity.addEvent(tEvent); if (enableUpdateEvent) { tEvent = new TimelineEvent(); - createAppModifiedEvent(appId, tEvent, "changed queue", 5); + long updatedTimeIndex = 4L; + createAppModifiedEvent(appId, tEvent, updatedTimeIndex++, "changed queue", 5); entity.addEvent(tEvent); // Change priority alone tEvent = new TimelineEvent(); - createAppModifiedEvent(appId, tEvent, "changed queue", 6); + createAppModifiedEvent(appId, tEvent, updatedTimeIndex++, "changed queue", 6); // Now change queue tEvent = new TimelineEvent(); - createAppModifiedEvent(appId, tEvent, "changed queue1", 6); + createAppModifiedEvent(appId, tEvent, updatedTimeIndex++, "changed queue1", 6); entity.addEvent(tEvent); } return entity; } private static void createAppModifiedEvent(ApplicationId appId, - TimelineEvent tEvent, String queue, int priority) { + TimelineEvent tEvent, long updatedTimeIndex, String queue, int priority) { tEvent.setEventType(ApplicationMetricsConstants.UPDATED_EVENT_TYPE); - tEvent.setTimestamp(Integer.MAX_VALUE + 4L + appId.getId()); + tEvent.setTimestamp(Integer.MAX_VALUE + updatedTimeIndex + appId.getId()); Map eventInfo = new HashMap(); eventInfo.put(ApplicationMetricsConstants.QUEUE_ENTITY_INFO, queue); eventInfo.put(ApplicationMetricsConstants.APPLICATION_PRIORITY_INFO, -- 2.7.4 (Apple Git-66)