hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtcarre...@apache.org
Subject hadoop git commit: YARN-4205. Addendum patch to fix branch-2.
Date Thu, 29 Sep 2016 22:42:23 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 cf954d7a4 -> 919c0802f


YARN-4205. Addendum patch to fix branch-2.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/919c0802
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/919c0802
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/919c0802

Branch: refs/heads/branch-2
Commit: 919c0802fa397647466c8554e96baa0e23823b02
Parents: cf954d7
Author: Li Lu <gtcarrera9@apache.org>
Authored: Thu Sep 29 15:41:31 2016 -0700
Committer: Li Lu <gtcarrera9@apache.org>
Committed: Thu Sep 29 15:41:31 2016 -0700

----------------------------------------------------------------------
 .../resourcemanager/rmapp/monitor/RMAppLifetimeMonitor.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/919c0802/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/monitor/RMAppLifetimeMonitor.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/monitor/RMAppLifetimeMonitor.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/monitor/RMAppLifetimeMonitor.java
index e550c97..19a2c7b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/monitor/RMAppLifetimeMonitor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/monitor/RMAppLifetimeMonitor.java
@@ -100,7 +100,10 @@ public class RMAppLifetimeMonitor
       ApplicationTimeoutType timeoutType, long monitorStartTime, long timeout) {
     RMAppToMonitor appToMonitor = new RMAppToMonitor(appId, timeoutType);
     register(appToMonitor, monitorStartTime);
-    monitoredApps.putIfAbsent(appToMonitor, timeout);
+    Long oldTimeout = monitoredApps.get(appToMonitor);
+    if (oldTimeout == null) {
+      monitoredApps.put(appToMonitor, timeout);
+    }
   }
 
   @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message