hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject [1/2] hadoop git commit: v6
Date Fri, 11 Mar 2016 22:24:51 GMT
Repository: hadoop
Updated Branches:
  refs/heads/yarn-4719 [created] c9892b7f6


v6


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

Branch: refs/heads/yarn-4719
Commit: c9892b7f67f71355a9d632a5672a6a1eb1cd2b18
Parents: 9fdde84
Author: Karthik Kambatla <kasha@cloudera.com>
Authored: Fri Mar 11 14:24:20 2016 -0800
Committer: Karthik Kambatla <kasha@cloudera.com>
Committed: Fri Mar 11 14:24:38 2016 -0800

----------------------------------------------------------------------
 .../resourcemanager/scheduler/capacity/CapacityScheduler.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c9892b7f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.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/scheduler/capacity/CapacityScheduler.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index eb58d02..735306a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -525,7 +525,7 @@ public class CapacityScheduler extends
     updatePlacementRules();
 
     // Re-calculate headroom for active applications
-    Resource clusterResource = nodeTracker.getClusterCapacity();
+    Resource clusterResource = getClusterResource();
     root.updateClusterResource(clusterResource, new ResourceLimits(
         clusterResource));
 


Mime
View raw message