You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ac...@apache.org on 2008/09/19 00:53:44 UTC
svn commit: r696844 - in /hadoop/core/trunk: CHANGES.txt
conf/hadoop-default.xml
src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolManager.java
src/mapred/org/apache/hadoop/mapred/JobConf.java
Author: acmurthy
Date: Thu Sep 18 15:53:44 2008
New Revision: 696844
URL: http://svn.apache.org/viewvc?rev=696844&view=rev
Log:
HADOOP-4083. Changed the configuration attribute queue.name to mapred.job.queue.name. Contributed by Hemanth Yamijala.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/conf/hadoop-default.xml
hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolManager.java
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobConf.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=696844&r1=696843&r2=696844&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Sep 18 15:53:44 2008
@@ -359,6 +359,9 @@
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
Modified: hadoop/core/trunk/conf/hadoop-default.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/conf/hadoop-default.xml?rev=696844&r1=696843&r2=696844&view=diff
==============================================================================
--- hadoop/core/trunk/conf/hadoop-default.xml (original)
+++ hadoop/core/trunk/conf/hadoop-default.xml Thu Sep 18 15:53:44 2008
@@ -1533,7 +1533,7 @@
</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
Modified: hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolManager.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolManager.java?rev=696844&r1=696843&r2=696844&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolManager.java (original)
+++ hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolManager.java Thu Sep 18 15:53:44 2008
@@ -69,7 +69,7 @@
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 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 - " +
Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobConf.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobConf.java?rev=696844&r1=696843&r2=696844&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobConf.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobConf.java Thu Sep 18 15:53:44 2008
@@ -1388,7 +1388,7 @@
* @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 @@
* @param queueName Name of the queue
*/
public void setQueueName(String queueName) {
- set("queue.name", queueName);
+ set("mapred.job.queue.name", queueName);
}
/**