svn commit: r1102534 - in /hadoop/mapreduce/branches/MR-279: ./ yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/ha...

[acmurthy]

Author: acmurthy
Date: Fri May 13 01:29:59 2011
New Revision: 1102534

URL: http://svn.apache.org/viewvc?rev=1102534&view=rev
Log:
Fixed reservation's bad interaction with delay scheduling in CS.

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/Application.java
    
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=1102534&r1=1102533&r2=1102534&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Fri May 13 01:29:59 2011
@@ -4,6 +4,9 @@ Trunk (unreleased changes)
 
   MAPREDUCE-279
 
+    Fixed reservation's bad interaction with delay scheduling in CS.
+    (acmurthy)
+
     Fixed CS user limits. (acmurthy)
 
     Adding valid state to ASM on a finish when its already completed and 

Modified: 
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/Application.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/Application.java?rev=1102534&r1=1102533&r2=1102534&view=diff
==============================================================================
--- 
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/Application.java
 (original)
+++ 
hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/Application.java
 Fri May 13 01:29:59 2011
@@ -405,9 +405,7 @@ public class Application {
   
   private static final int OVERRIDE = 1000000;
   synchronized public void overrideSchedulingOpportunities(Priority priority) {
-    Integer schedulingOpportunities = 
this.schedulingOpportunities.get(priority);
-    schedulingOpportunities = OVERRIDE;
-    this.schedulingOpportunities.put(priority, schedulingOpportunities);
+    this.schedulingOpportunities.put(priority, OVERRIDE);
   }
   
   synchronized public void showRequests() {

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=1102534&r1=1102533&r2=1102534&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
 Fri May 13 01:29:59 2011
@@ -577,6 +577,9 @@ public class LeafQueue implements Queue 
         // Do we reserve containers at this 'priority'?
         if (application.isReserved(node, priority)) {
           
+          // Do not care about locality
+          application.overrideSchedulingOpportunities(priority);
+          
           // Do we really need this reservation still?
           ResourceRequest offSwitchRequest = 
             application.getResourceRequest(priority, NodeManager.ANY);