Repository: hadoop Updated Branches: refs/heads/trunk cf62ff9a6 -> 29dad7d25
YARN-8616. systemClock should be used in RMAppImpl instead of System.currentTimeMills(), to be consistent. (Contributed by Szilard Nemeth) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/29dad7d2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/29dad7d2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/29dad7d2 Branch: refs/heads/trunk Commit: 29dad7d258c621a0ff3a64c595a2e32c66c59d11 Parents: cf62ff9 Author: Haibo Chen <[email protected]> Authored: Mon Sep 24 16:02:57 2018 -0700 Committer: Haibo Chen <[email protected]> Committed: Mon Sep 24 16:04:28 2018 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/29dad7d2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java ---------------------------------------------------------------------- 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 42e2bcf..d57f22c 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 class RMAppImpl implements RMApp, Recoverable { } 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 class RMAppImpl implements RMApp, Recoverable { try { this.readLock.lock(); if (!isLogAggregationFinished() && isAppInFinalState(this) && - System.currentTimeMillis() > this.logAggregationStartTime + systemClock.getTime() > this.logAggregationStartTime + this.logAggregationStatusTimeout) { for (Entry<NodeId, LogAggregationReport> output : logAggregationStatus.entrySet()) { @@ -2060,7 +2060,7 @@ public class RMAppImpl implements RMApp, Recoverable { String appViewACLs = submissionContext.getAMContainerSpec() .getApplicationACLs().get(ApplicationAccessType.VIEW_APP); rmContext.getSystemMetricsPublisher().appACLsUpdated( - this, appViewACLs, System.currentTimeMillis()); + this, appViewACLs, systemClock.getTime()); } @Private --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
