svn commit: r1075212 - in /hadoop/mapreduce/branches/branch-0.22: CHANGES.txt src/contrib/dynamic-scheduler/README src/contrib/dynamic-scheduler/src/java/org/apache/hadoop/mapred/DynamicPriorityScheduler.java

[to...@apache.org]

Author: tomwhite
Date: Mon Feb 28 05:21:50 2011
New Revision: 1075212

URL: http://svn.apache.org/viewvc?rev=1075212&view=rev
Log:
Merge -r 1075210:1075211 from trunk to branch-0.22. Fixes: MAPREDUCE-2054

Modified:
    hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/README
    hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/src/java/org/apache/hadoop/mapred/DynamicPriorityScheduler.java

Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1075212&r1=1075211&r2=1075212&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Mon Feb 28 05:21:50 2011
@@ -490,6 +490,9 @@ Release 0.22.0 - Unreleased
     
     MAPREDUCE-2315. javadoc is failing in nightly build (todd)
 
+    MAPREDUCE-2054. Hierarchical queue implementation broke dynamic queue
+    addition in Dynamic Scheduler. (Thomas Sandholm via tomwhite)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

Modified: hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/README
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/README?rev=1075212&r1=1075211&r2=1075212&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/README (original)
+++ hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/README Mon Feb 28 05:21:50 2011
@@ -162,6 +162,6 @@ else:
   params = ""
 timestamp = long(time.time()*1000)
 params = params + "&user=%s&timestamp=%d" % (USER,timestamp)
-print "-Dmapred.job.timestamp=%d -Dmapred.job.signature=%s -Dmapreduce.job.queue.name=%s" % (timestamp, hmac_sha1(params, KEY), USER)
+print "-Dmapred.job.timestamp=%d -Dmapred.job.signature=%s -Dmapreduce.job.queuename=%s" % (timestamp, hmac_sha1(params, KEY), USER)
 
 

Modified: hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/src/java/org/apache/hadoop/mapred/DynamicPriorityScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/src/java/org/apache/hadoop/mapred/DynamicPriorityScheduler.java?rev=1075212&r1=1075211&r2=1075212&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/src/java/org/apache/hadoop/mapred/DynamicPriorityScheduler.java (original)
+++ hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/src/java/org/apache/hadoop/mapred/DynamicPriorityScheduler.java Mon Feb 28 05:21:50 2011
@@ -111,9 +111,21 @@ class DynamicPriorityScheduler extends T
       totalSpending = 0.0f;
       for (BudgetQueue queue: store.getQueues()) {
         if (!infoQueues.contains(queue.name)) {
-          infoQueues.add(queue.name);
+          Queue[] newQueues = new Queue[infoQueues.size()+1];
+          int i = 0;
+          for (String infoQueue: infoQueues) {
+            newQueues[i] = queueManager.getQueue(infoQueue);
+            i++;
+          }
+          Queue newQueue = new Queue();
+          newQueue.setName(queue.name);
+          newQueues[i] = newQueue;
+          queueManager.setQueues(newQueues);
+
           QueueInfo newQueueInfo = new QueueInfo(queue.name, null, this); 
           queueManager.setSchedulerInfo(queue.name, newQueueInfo);
+
+          infoQueues = queueManager.getLeafQueueNames();
         }
         if (!queueList.equals("")) {
           queueList += ",";