svn commit: r1084094 - /hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java

[vinodkv]

Author: vinodkv
Date: Tue Mar 22 08:18:52 2011
New Revision: 1084094

URL: http://svn.apache.org/viewvc?rev=1084094&view=rev
Log:
Fix CapacityScheduler#normalizeRequest. Contributed by Luke Lu.

Modified:
    
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java

Modified: 
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.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/CapacityScheduler.java?rev=1084094&r1=1084093&r2=1084094&view=diff
==============================================================================
--- 
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
 (original)
+++ 
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
 Tue Mar 22 08:18:52 2011
@@ -289,8 +289,8 @@ implements ResourceScheduler, CapacitySc
   private void normalizeRequest(ResourceRequest ask) {
     int memory = ask.capability.memory;
     int minMemory = minimumAllocation.memory;
-    memory = 
-      minMemory * ((memory/minMemory) + (memory%minMemory)); 
+    ask.capability.memory =
+      minMemory * ((memory/minMemory) + (memory%minMemory > 0 ? 1 : 0));
   }