commit 4ccd5a69d27d29a536ecf6ff5fc3327d7f459784

Author: Yahoo\! <ltucker@yahoo-inc.com>
Date:   Tue Aug 25 09:33:35 2009 -0700

    Add MAPREDUCE-768 from patch http://issues.apache.org/jira/secure/attachment/12417616/MAPREDUCE-768-ydist.patch


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

src/docs/src/documentation/content/xdocs/commands_manual.xml

@@ -577,15 +577,23 @@
         </tr>
         </table>
       </section>
-			<section>
-				<title> jobtracker </title>
-				<p>
-					Runs the MapReduce job Tracker node.
-				</p> 
-				<p>
-					<code>Usage: hadoop jobtracker</code>
-				</p>
-			</section>
+      <section>
+	<title> jobtracker </title>
+	<p>Runs the MapReduce job Tracker node.</p> 
+	<p><code>Usage: hadoop jobtracker [-dumpConfiguration]</code></p>
+        <table>
+        <tr>
+        <th>COMMAND_OPTION</th><th> Description</th>
+        </tr>
+        <tr>
+        <td><code>-dumpConfiguration</code></td>
+        <td> Dumps the configuration used by the JobTracker alongwith queue
+        configuration in JSON format into Standard output used by the 
+        jobtracker and exits.</td>
+        </tr>
+        </table>
+				
+      </section>
 			
 			<section>
 				<title> namenode </title>

src/mapred/mapred-default.xml

@@ -817,33 +817,6 @@
   </description>
 </property>
 
-<property>
-  <name>mapred.queue.names</name>
-  <value>default</value>
-  <description> Comma separated list of queues configured for this jobtracker.
-    Jobs are added to queues and schedulers can configure different 
-    scheduling properties for the various queues. To configure a property 
-    for a queue, the name of the queue must match the name specified in this 
-    value. Queue properties that are common to all schedulers are configured 
-    here with the naming convention, mapred.queue.$QUEUE-NAME.$PROPERTY-NAME,
-    for e.g. mapred.queue.default.submit-job-acl.
-    The number of queues configured in this parameter could depend on the
-    type of scheduler being used, as specified in 
-    mapred.jobtracker.taskScheduler. For example, the JobQueueTaskScheduler
-    supports only a single queue, which is the default configured here.
-    Before adding more queues, ensure that the scheduler you've configured
-    supports multiple queues.
-  </description>
-</property>
-
-<property>
-  <name>mapred.acls.enabled</name>
-  <value>false</value>
-  <description> Specifies whether ACLs are enabled, and should be checked
-    for various operations.
-  </description>
-</property>
-
 <property>
   <name>mapred.job.queue.name</name>
   <value>default</value>

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

@@ -24,8 +24,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
@@ -4246,19 +4248,38 @@ public class JobTracker implements MRConstants, InterTrackerProtocol,
   public static void main(String argv[]
                           ) throws IOException, InterruptedException {
     StringUtils.startupShutdownMessage(JobTracker.class, argv, LOG);
-    if (argv.length != 0) {
-      System.out.println("usage: JobTracker");
-      System.exit(-1);
-    }
-      
+    
     try {
-      JobTracker tracker = startTracker(new JobConf());
-      tracker.offerService();
+      if(argv.length == 0) {
+        JobTracker tracker = startTracker(new JobConf());
+        tracker.offerService();
+      }
+      else {
+        if ("-dumpConfiguration".equals(argv[0]) && argv.length == 1) {
+          dumpConfiguration(new PrintWriter(System.out));
+        }
+        else {
+          System.out.println("usage: JobTracker [-dumpConfiguration]");
+          System.exit(-1);
+        }
+      }
     } catch (Throwable e) {
       LOG.fatal(StringUtils.stringifyException(e));
       System.exit(-1);
     }
   }
+  /**
+   * Dumps the configuration properties in Json format
+   * @param writer {@link}Writer object to which the output is written
+   * @throws IOException
+   */
+  private static void dumpConfiguration(Writer writer) throws IOException {
+    Configuration.dumpConfiguration(new JobConf(), writer);
+    writer.write("\n");
+    // get the QueueManager configuration properties
+    QueueManager.dumpConfiguration(writer);
+    writer.write("\n");
+  }
 
   @Override
   public JobQueueInfo[] getQueues() throws IOException {

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

@@ -19,6 +19,8 @@
 package org.apache.hadoop.mapred;
 
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;
@@ -364,4 +366,18 @@ class QueueManager {
             queueAclsInfolist.size()]);
   }
 
+  /**
+   * prints the configuration of QueueManager in Json format.
+   * The method should be modified accordingly whenever
+   * QueueManager(Configuration) constructor is modified.
+   * @param writer {@link}Writer object to which the configuration properties 
+   * are printed in json format
+   * @throws IOException
+   */
+  static void dumpConfiguration(Writer writer) throws IOException {
+    Configuration conf = new Configuration(false);
+    conf.addResource(QUEUE_ACLS_FILE_NAME);
+    Configuration.dumpConfiguration(conf, writer);
+  }
+
 }