You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2011/05/16 03:54:18 UTC
svn commit: r1103592 - in /hadoop/mapreduce/branches/MR-279: CHANGES.txt
yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
Author: acmurthy
Date: Mon May 16 01:54:18 2011
New Revision: 1103592
URL: http://svn.apache.org/viewvc?rev=1103592&view=rev
Log:
Fix calculation of maximum capacity to use parent's absolute-capacity rather than the leaf queue's absolute-capacity.
Modified:
hadoop/mapreduce/branches/MR-279/CHANGES.txt
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1103592&r1=1103591&r2=1103592&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Mon May 16 01:54:18 2011
@@ -4,6 +4,9 @@ Trunk (unreleased changes)
MAPREDUCE-279
+ Fix calculation of maximum capacity to use parent's absolute-capacity
+ rather than the leaf queue's absolute-capacity. (acmurthy)
+
Speed up communication between MR AM and RM by relying on a new config
rather than AM_EXPIRY_INTERVAL which is too large. (acmurthy)
Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java?rev=1103592&r1=1103591&r2=1103592&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java Mon May 16 01:54:18 2011
@@ -601,10 +601,11 @@ public class LeafQueue implements Queue
private synchronized boolean assignToQueue(Resource clusterResource,
Resource required) {
- float newUtilization =
+ // Check how of the parent's capacity we are currently using...
+ float newCapacity =
(float)(usedResources.getMemory() + required.getMemory()) /
- (clusterResource.getMemory() * absoluteCapacity);
- if (newUtilization > absoluteMaxCapacity) {
+ (clusterResource.getMemory() * parent.getAbsoluteCapacity());
+ if (newCapacity > absoluteMaxCapacity) {
LOG.info(getQueueName() +
" current-capacity (" + getUtilization() + ") +" +
" required (" + required.getMemory() + ")" +