Browse Source

YARN-5094. some YARN container events have timestamp of -1.

(cherry picked from commit 4aca4ff759f773135f8a27dbaa9731196fac5233)
(cherry picked from commit 8793e45f53607315bf6c99902452ba6cf2e3eb72)
(cherry picked from commit 895a0391fe4d7dc2b19bea6cc0528b7fd607f643)
Haibo Chen 7 years ago
parent
commit
c4ba8eb003

+ 1 - 1
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;
   }
 

+ 1 - 1
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;
   }
 

+ 1 - 1
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());
   }
 
 }

+ 4 - 2
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) {