You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2010/03/05 09:33:12 UTC

svn commit: r919330 - in /hadoop/mapreduce/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/DeprecatedQueueConfigurationParser.java

Author: acmurthy
Date: Fri Mar  5 08:33:12 2010
New Revision: 919330

URL: http://svn.apache.org/viewvc?rev=919330&view=rev
Log:
MAPREDUCE-1527. Better warning logged when mapred.queue.names is overshadowed by mapred-queues.xml. Contributed by Hong Tang.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/DeprecatedQueueConfigurationParser.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=919330&r1=919329&r2=919330&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Mar  5 08:33:12 2010
@@ -203,6 +203,9 @@
     MAPREDUCE-1408. Add customizable job submission policies to Gridmix. (Rahul
     Singh via cdouglas)
 
+    MAPREDUCE-1527. Better warning logged when mapred.queue.names is
+    overshadowed by mapred-queues.xml. (Hong Tang via acmurthy) 
+
   OPTIMIZATIONS
 
     MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band

Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/DeprecatedQueueConfigurationParser.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/DeprecatedQueueConfigurationParser.java?rev=919330&r1=919329&r2=919330&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/DeprecatedQueueConfigurationParser.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/DeprecatedQueueConfigurationParser.java Fri Mar  5 08:33:12 2010
@@ -95,10 +95,11 @@
       return false;
     } else {
       LOG.warn(
-        "Configuring \"mapred.queue.names\" in mapred-site.xml or " +
-          "hadoop-site.xml is deprecated. Configure " +
-          "queue hierarchy  in " +
-          QUEUE_CONF_FILE_NAME);
+          "Configuring \"" + MAPRED_QUEUE_NAMES_KEY
+          + "\" in mapred-site.xml or "
+          + "hadoop-site.xml is deprecated and will overshadow "
+          + QUEUE_CONF_FILE_NAME + ". Remove this property and configure "
+          + "queue hierarchy in " + QUEUE_CONF_FILE_NAME);
       // store queues so we can check if ACLs are also configured
       // in the deprecated files.
       queues = conf.getStrings(MAPRED_QUEUE_NAMES_KEY);