svn commit: r732233 - in /hadoop/core/branches/branch-0.20: ./ src/contrib/capacity-scheduler/ src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/ src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/ src/test/org/apache/hadoo...

[yhemanth]

Author: yhemanth
Date: Tue Jan  6 21:58:27 2009
New Revision: 732233

URL: http://svn.apache.org/viewvc?rev=732233&view=rev
Log:
Merge -r 732230:732231 from trunk to branch 0.20 to fix HADOOP-4830.

Added:
    
hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/ClusterWithCapacityScheduler.java
      - copied unchanged from r732231, 
hadoop/core/trunk/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/ClusterWithCapacityScheduler.java
    
hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestQueueCapacities.java
      - copied unchanged from r732231, 
hadoop/core/trunk/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestQueueCapacities.java
    
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/ControlledMapReduceJob.java
      - copied unchanged from r732231, 
hadoop/core/trunk/src/test/org/apache/hadoop/mapred/ControlledMapReduceJob.java
    
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/TestControlledMapReduceJob.java
      - copied unchanged from r732231, 
hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestControlledMapReduceJob.java
Modified:
    hadoop/core/branches/branch-0.20/CHANGES.txt
    hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/ivy.xml
    
hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java
    
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=732233&r1=732232&r2=732233&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Tue Jan  6 21:58:27 2009
@@ -289,6 +289,9 @@
     HADOOP-4909. Fix Javadoc and make some of the API more consistent in their
     use of the JobContext instead of Configuration. (omalley)
 
+    HADOOP-4830. Add end-to-end test cases for testing queue capacities.
+    (Vinod Kumar Vavilapalli via yhemanth)
+
   OPTIMIZATIONS
 
     HADOOP-3293. Fixes FileInputFormat to do provide locations for splits

Modified: 
hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/ivy.xml
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/ivy.xml?rev=732233&r1=732232&r2=732233&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/ivy.xml 
(original)
+++ hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/ivy.xml Tue 
Jan  6 21:58:27 2009
@@ -36,5 +36,21 @@
       name="log4j"
       rev="${log4j.version}"
       conf="common->master"/>
-    </dependencies>
+    <dependency org="org.mortbay.jetty"
+      name="jetty-util"
+      rev="${jetty-util.version}"
+      conf="common->master"/>
+    <dependency org="org.mortbay.jetty"
+      name="jetty"
+      rev="${jetty.version}"
+      conf="common->master"/>
+    <dependency org="org.mortbay.jetty"
+      name="servlet-api-2.5"
+      rev="${servlet-api-2.5.version}"
+      conf="common->master"/> 
+    <dependency org="commons-httpclient"
+      name="commons-httpclient"
+      rev="${commons-httpclient.version}"
+      conf="common->master"/> 
+  </dependencies>
 </ivy-module>

Modified: 
hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java?rev=732233&r1=732232&r2=732233&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java
 (original)
+++ 
hadoop/core/branches/branch-0.20/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java
 Tue Jan  6 21:58:27 2009
@@ -286,7 +286,7 @@
     initializeDefaults();
   }
   
-  private static final String toFullPropertyName(String queue, 
+  static final String toFullPropertyName(String queue, 
                                                   String property) {
       return QUEUE_CONF_PROPERTY_NAME_PREFIX + queue + "." + property;
   }

Modified: 
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java?rev=732233&r1=732232&r2=732233&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java
 (original)
+++ 
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java
 Tue Jan  6 21:58:27 2009
@@ -154,6 +154,10 @@
     return dfsCluster.getFileSystem();
   }
 
+  protected MiniMRCluster getMRCluster() {
+    return mrCluster;
+  }
+
   /**
    * Returns the path to the root directory for the testcase.
    *