HADOOP-5718. Remove the check for the default queue in capacity scheduler. Contributed by Sreekanth Ramakrishnan.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@771667 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -40,6 +40,9 @@ Release 0.20.1 - Unreleased
     was used and user closed a output stream without writing any data.
     (Zheng Shao via dhruba)
 
+    HADOOP-5718. Remove the check for the default queue in capacity scheduler.
+    (Sreekanth Ramakrishnan via yhemanth)
+
 Release 0.20.0 - 2009-04-15
 
   INCOMPATIBLE CHANGES

src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java

@@ -592,9 +592,7 @@ class CapacityTaskScheduler extends TaskScheduler {
   private int prevMapClusterCapacity = 0;
   private int prevReduceClusterCapacity = 0;
   
-  /** name of the default queue. */ 
-  static final String DEFAULT_QUEUE_NAME = "default";
-  
+    
   static final Log LOG = LogFactory.getLog(CapacityTaskScheduler.class);
   protected JobQueuesManager jobQueuesManager;
   protected CapacitySchedulerConf schedConf;
@@ -717,10 +715,6 @@ class CapacityTaskScheduler extends TaskScheduler {
       schedConf.setCapacity(queue, quantityToAllocate);
     }    
     
-    // check if there's a queue with the default name. If not, we quit.
-    if (!queueInfoMap.containsKey(DEFAULT_QUEUE_NAME)) {
-      throw new IllegalStateException("System has no default queue configured");
-    }
     if (totalCapacity > 100.0) {
       throw new IllegalArgumentException("Sum of queue capacities over 100% at "
                                          + totalCapacity);

src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java

@@ -1247,6 +1247,7 @@ public class TestCapacityScheduler extends TestCase {
 
     //Raise status change event so that jobs can move to running queue.
     raiseStatusChangeEvents(scheduler.jobQueuesManager);
+    raiseStatusChangeEvents(scheduler.jobQueuesManager, "q2");
     //assign one job
     Task t1 = checkAssignment("tt1", "attempt_test_0001_m_000001_0 on tt1");
     //Initalize extra job.
@@ -1331,6 +1332,7 @@ public class TestCapacityScheduler extends TestCase {
     //in running queue as we just failed the second job which was initialized
     //and completed the first one.
     raiseStatusChangeEvents(scheduler.jobQueuesManager);
+    raiseStatusChangeEvents(scheduler.jobQueuesManager, "q2");
 
     //Now schedule a map should be job3 of the user as job1 succeeded job2
     //failed and now job3 is running
@@ -1988,6 +1990,25 @@ public class TestCapacityScheduler extends TestCase {
     
   }
   
+  public void testStartWithoutDefaultQueueConfigured() throws Exception {
+    //configure a single queue which is not default queue
+    String[] qs = {"q1"};
+    taskTrackerManager.addQueues(qs);
+    ArrayList<FakeQueueInfo> queues = new ArrayList<FakeQueueInfo>();
+    queues.add(new FakeQueueInfo("q1", 100.0f, true, 100));
+    resConf.setFakeQueues(queues);
+    scheduler.setResourceManagerConf(resConf);
+    //Start the scheduler.
+    scheduler.start();
+    //Submit a job and wait till it completes
+    FakeJobInProgress job = 
+      submitJob(JobStatus.PREP, 1, 1, "q1", "u1");
+    controlledInitializationPoller.selectJobsToInitialize();
+    raiseStatusChangeEvents(scheduler.jobQueuesManager, "q1");
+    Task t = checkAssignment("tt1", "attempt_test_0001_m_000001_0 on tt1");
+    t = checkAssignment("tt1", "attempt_test_0001_r_000001_0 on tt1");
+  }
+  
   private void checkRunningJobMovementAndCompletion() throws IOException {
     
     JobQueuesManager mgr = scheduler.jobQueuesManager;
@@ -2103,7 +2124,11 @@ public class TestCapacityScheduler extends TestCase {
   }
   
   private void raiseStatusChangeEvents(JobQueuesManager mgr) {
-    Collection<JobInProgress> jips = mgr.getWaitingJobs("default");
+    raiseStatusChangeEvents(mgr, "default");
+  }
+  
+  private void raiseStatusChangeEvents(JobQueuesManager mgr, String queueName) {
+    Collection<JobInProgress> jips = mgr.getWaitingJobs(queueName);
     for(JobInProgress jip : jips) {
       if(jip.getStatus().getRunState() == JobStatus.RUNNING) {
         JobStatusChangeEvent evt = new JobStatusChangeEvent(jip,