diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java index 42e2bcff468..d57f22ccdb5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java @@ -1507,7 +1507,7 @@ public FinalTransition(RMAppState finalState) { } public void transition(RMAppImpl app, RMAppEvent event) { - app.logAggregationStartTime = System.currentTimeMillis(); + app.logAggregationStartTime = app.systemClock.getTime(); for (NodeId nodeId : app.getRanNodes()) { app.handler.handle( new RMNodeCleanAppEvent(nodeId, app.applicationId)); @@ -1767,7 +1767,7 @@ public ReservationId getReservationId() { try { this.readLock.lock(); if (!isLogAggregationFinished() && isAppInFinalState(this) && - System.currentTimeMillis() > this.logAggregationStartTime + systemClock.getTime() > this.logAggregationStartTime + this.logAggregationStatusTimeout) { for (Entry output : logAggregationStatus.entrySet()) { @@ -2060,7 +2060,7 @@ private void sendATSCreateEvent() { String appViewACLs = submissionContext.getAMContainerSpec() .getApplicationACLs().get(ApplicationAccessType.VIEW_APP); rmContext.getSystemMetricsPublisher().appACLsUpdated( - this, appViewACLs, System.currentTimeMillis()); + this, appViewACLs, systemClock.getTime()); } @Private