HADOOP-4083. Changed the configuration attribute queue.name to mapred.job.queue.name. Contributed by Hemanth Yamijala.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@696844 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -359,6 +359,9 @@ Trunk (unreleased changes)
     HADOOP-2411. Add support for larger CPU EC2 instance types.
     (Chris K Wensel via tomwhite)
 
+    HADOOP-4083. Changed the configuration attribute queue.name to
+    mapred.job.queue.name. (Hemanth Yamijala via acmurthy) 
+
   OPTIMIZATIONS
 
     HADOOP-3556. Removed lock contention in MD5Hash by changing the 

conf/hadoop-default.xml

@@ -1533,7 +1533,7 @@ creations/deletions), or "all".</description>
 </property>
 
 <property>
-  <name>queue.name</name>
+  <name>mapred.job.queue.name</name>
   <value>default</value>
   <description> Queue to which a job is submitted. This must match one of the
     queues defined in mapred.queue.names for the system. Also, the ACL setup

src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolManager.java

@@ -69,7 +69,7 @@ public class PoolManager {
 
   private String allocFile; // Path to XML file containing allocations
   private String poolNameProperty; // Jobconf property to use for determining a
-                                   // job's pool name (default: queue.name)
+                                   // job's pool name (default: mapred.job.queue.name)
   
   private Map<String, Pool> pools = new HashMap<String, Pool>();
   
@@ -80,7 +80,7 @@ public class PoolManager {
   public PoolManager(Configuration conf) throws IOException, SAXException,
       AllocationConfigurationException, ParserConfigurationException {
     this.poolNameProperty = conf.get(
-        "mapred.fairscheduler.poolnameproperty", "queue.name");
+        "mapred.fairscheduler.poolnameproperty", "mapred.job.queue.name");
     this.allocFile = conf.get("mapred.fairscheduler.allocation.file");
     if (allocFile == null) {
       LOG.warn("No mapred.fairscheduler.allocation.file given in jobconf - " +

src/mapred/org/apache/hadoop/mapred/JobConf.java

@@ -1388,7 +1388,7 @@ public class JobConf extends Configuration {
    * @return name of the queue
    */
   public String getQueueName() {
-    return get("queue.name", DEFAULT_QUEUE_NAME);
+    return get("mapred.job.queue.name", DEFAULT_QUEUE_NAME);
   }
   
   /**
@@ -1397,7 +1397,7 @@ public class JobConf extends Configuration {
    * @param queueName Name of the queue
    */
   public void setQueueName(String queueName) {
-    set("queue.name", queueName);
+    set("mapred.job.queue.name", queueName);
   }
   
   /**