Repository: hadoop Updated Branches: refs/heads/trunk 130f8bce0 -> 4aca4ff75
YARN-5094. some YARN container events have timestamp of -1. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4aca4ff7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4aca4ff7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4aca4ff7 Branch: refs/heads/trunk Commit: 4aca4ff759f773135f8a27dbaa9731196fac5233 Parents: 130f8bc Author: Haibo Chen <haiboc...@apache.org> Authored: Fri Jan 19 10:27:02 2018 -0800 Committer: Haibo Chen <haiboc...@apache.org> Committed: Fri Jan 19 10:27:46 2018 -0800 ---------------------------------------------------------------------- .../containermanager/application/ApplicationEvent.java | 2 +- .../nodemanager/containermanager/container/ContainerEvent.java | 2 +- .../containermanager/localizer/event/LocalizationEvent.java | 2 +- .../containermanager/application/TestApplication.java | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4aca4ff7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationEvent.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationEvent.java index a52fd72..c14dc99 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationEvent.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationEvent.java @@ -27,7 +27,7 @@ public class ApplicationEvent extends AbstractEvent<ApplicationEventType> { public ApplicationEvent(ApplicationId appID, ApplicationEventType appEventType) { - super(appEventType); + super(appEventType, System.currentTimeMillis()); this.applicationID = appID; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4aca4ff7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerEvent.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerEvent.java index 46ec270..cfb9c17 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerEvent.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerEvent.java @@ -27,7 +27,7 @@ public class ContainerEvent extends AbstractEvent<ContainerEventType> { private final ContainerId containerID; public ContainerEvent(ContainerId cID, ContainerEventType eventType) { - super(eventType); + super(eventType, System.currentTimeMillis()); this.containerID = cID; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4aca4ff7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/event/LocalizationEvent.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/event/LocalizationEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/event/LocalizationEvent.java index 417935e..549c960 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/event/LocalizationEvent.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/event/LocalizationEvent.java @@ -27,7 +27,7 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.Reso public class LocalizationEvent extends AbstractEvent<LocalizationEventType> { public LocalizationEvent(LocalizationEventType event) { - super(event); + super(event, System.currentTimeMillis()); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4aca4ff7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java index 65558e9..c8f28e2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java @@ -262,7 +262,8 @@ public class TestApplication { verify(wa.localizerBus).handle( refEq(new ApplicationLocalizationEvent( - LocalizationEventType.DESTROY_APPLICATION_RESOURCES, wa.app))); + LocalizationEventType.DESTROY_APPLICATION_RESOURCES, + wa.app), "timestamp")); verify(wa.auxBus).handle( refEq(new AuxServicesEvent( @@ -341,7 +342,8 @@ public class TestApplication { verify(wa.localizerBus).handle( refEq(new ApplicationLocalizationEvent( - LocalizationEventType.DESTROY_APPLICATION_RESOURCES, wa.app))); + LocalizationEventType.DESTROY_APPLICATION_RESOURCES, wa.app), + "timestamp")); wa.appResourcesCleanedup(); for ( Container container : wa.containers) { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org