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/04/17 07:51:47 UTC
svn commit: r1094105 - 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: Sun Apr 17 05:51:47 2011
New Revision: 1094105
URL: http://svn.apache.org/viewvc?rev=1094105&view=rev
Log:
Fixed computation of user-limits at runtime.
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=1094105&r1=1094104&r2=1094105&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Sun Apr 17 05:51:47 2011
@@ -4,6 +4,8 @@ Trunk (unreleased changes)
MAPREDUCE-279
+ Fixed computation of user-limits at runtime. (acmurthy)
+
Implement 'bin/mapred queue [-info [-showJobs]] [-list] and enhanced
'bin/mapred job -list' to show queue and ApplicationMaster information.
(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=1094105&r1=1094104&r2=1094105&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 Sun Apr 17 05:51:47 2011
@@ -411,10 +411,12 @@ public class LeafQueue implements Queue
// Allow progress for queues with miniscule capacity
final int queueCapacity =
Math.max(
- divideAndCeil((int)(absoluteCapacity * clusterResource.getMemory()),
- minimumAllocation.getMemory()),
+ divideAndCeil(
+ (int)(absoluteCapacity * clusterResource.getMemory()),
+ minimumAllocation.getMemory())
+ * minimumAllocation.getMemory(), // round up
required.getMemory());
-
+
final int consumed = usedResources.getMemory();
final int currentCapacity =
(consumed < queueCapacity) ? queueCapacity : (consumed + required.getMemory());
@@ -443,7 +445,8 @@ public class LeafQueue implements Queue
" queueCapacity: " + queueCapacity +
" qconsumed: " + consumed +
" currentCapacity: " + currentCapacity +
- " activeUsers: " + activeUsers
+ " activeUsers: " + activeUsers +
+ " clusterCapacity: " + clusterResource.getMemory()
);
return false;
}