Modified: hadoop/core/branches/branch-0.19/docs/quickstart.html URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/docs/quickstart.html?rev=706341&r1=706340&r2=706341&view=diff ============================================================================== --- hadoop/core/branches/branch-0.19/docs/quickstart.html (original) +++ hadoop/core/branches/branch-0.19/docs/quickstart.html Mon Oct 20 10:12:38 2008 @@ -153,6 +153,9 @@ <a href="hod.html">Hadoop On Demand</a> </div> <div class="menuitem"> +<a href="capacity_scheduler.html">Capacity Scheduler</a> +</div> +<div class="menuitem"> <a href="api/index.html">API Docs</a> </div> <div class="menuitem">
Modified: hadoop/core/branches/branch-0.19/docs/streaming.html URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/docs/streaming.html?rev=706341&r1=706340&r2=706341&view=diff ============================================================================== --- hadoop/core/branches/branch-0.19/docs/streaming.html (original) +++ hadoop/core/branches/branch-0.19/docs/streaming.html Mon Oct 20 10:12:38 2008 @@ -156,6 +156,9 @@ <a href="hod.html">Hadoop On Demand</a> </div> <div class="menuitem"> +<a href="capacity_scheduler.html">Capacity Scheduler</a> +</div> +<div class="menuitem"> <a href="api/index.html">API Docs</a> </div> <div class="menuitem"> Modified: hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/cluster_setup.xml URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/cluster_setup.xml?rev=706341&r1=706340&r2=706341&view=diff ============================================================================== --- hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/cluster_setup.xml (original) +++ hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/cluster_setup.xml Mon Oct 20 10:12:38 2008 @@ -244,6 +244,65 @@ TaskTrackers. </td> </tr> + <tr> + <td>mapred.queue.names</td> + <td>Comma separated list of queues to which jobs can be submitted.</td> + <td> + The Map/Reduce system always supports atleast one queue + with the name as <em>default</em>. Hence, this parameter's + value should always contain the string <em>default</em>. + Some job schedulers supported in Hadoop, like the + <a href="capacity_scheduler.html">Capacity + Scheduler</a>, support multiple queues. If such a scheduler is + being used, the list of configured queue names must be + specified here. Once queues are defined, users can submit + jobs to a queue using the property name + <em>mapred.job.queue.name</em> in the job configuration. + There could be a separate + configuration file for configuring properties of these + queues that is managed by the scheduler. + Refer to the documentation of the scheduler for information on + the same. + </td> + </tr> + <tr> + <td>mapred.acls.enabled</td> + <td>Specifies whether ACLs are supported for controlling job + submission and administration</td> + <td> + If <em>true</em>, ACLs would be checked while submitting + and administering jobs. ACLs can be specified using the + configuration parameters of the form + <em>mapred.queue.queue-name.acl-name</em>, defined below. + </td> + </tr> + <tr> + <td>mapred.queue.<em>queue-name</em>.acl-submit-job</td> + <td>List of users and groups that can submit jobs to the + specified <em>queue-name</em>.</td> + <td> + The list of users and groups are both comma separated + list of names. The two lists are separated by a blank. + Example: <em>user1,user2 group1,group2</em>. + If you wish to define only a list of groups, provide + a blank at the beginning of the value. + </td> + </tr> + <tr> + <td>mapred.queue.<em>queue-name</em>.acl-administer-job</td> + <td>List of users and groups that can change the priority + or kill jobs that have been submitted to the + specified <em>queue-name</em>.</td> + <td> + The list of users and groups are both comma separated + list of names. The two lists are separated by a blank. + Example: <em>user1,user2 group1,group2</em>. + If you wish to define only a list of groups, provide + a blank at the beginning of the value. Note that an + owner of a job can always change the priority or kill + his/her own job, irrespective of the ACLs. + </td> + </tr> </table> <p>Typically all the above parameters are marked as Modified: hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=706341&r1=706340&r2=706341&view=diff ============================================================================== --- hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml (original) +++ hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml Mon Oct 20 10:12:38 2008 @@ -1703,6 +1703,23 @@ <title>Other Useful Features</title> <section> + <title>Submitting Jobs to a Queue</title> + <p>Some job schedulers supported in Hadoop, like the + <a href="capacity_scheduler.html">Capacity + Scheduler</a>, support multiple queues. If such a scheduler is + being used, users can submit jobs to one of the queues + administrators would have defined in the + <em>mapred.queue.names</em> property of the Hadoop site + configuration. The queue name can be specified through the + <em>mapred.job.queue.name</em> property, or through the + <a href="ext:api/org/apache/hadoop/mapred/jobconf/setqueuename">setQueueName(String)</a> + API. Note that administrators may choose to define ACLs + that control which queues a job can be submitted to by a + given user. In that case, if the job is not submitted + to one of the queues where the user has access, + the job would be rejected.</p> + </section> + <section> <title>Counters</title> <p><code>Counters</code> represent global counters, defined either by Modified: hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/site.xml URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/site.xml?rev=706341&r1=706340&r2=706341&view=diff ============================================================================== --- hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/site.xml (original) +++ hadoop/core/branches/branch-0.19/src/docs/src/documentation/content/xdocs/site.xml Mon Oct 20 10:12:38 2008 @@ -52,6 +52,7 @@ <hod-admin-guide href="hod_admin_guide.html"/> <hod-config-guide href="hod_config_guide.html"/> </hod> + <capacity_scheduler label="Capacity Scheduler" href="capacity_scheduler.html"/> <api label="API Docs" href="ext:api/index" /> <jdiff label="API Changes" href="ext:jdiff/changes" /> <wiki label="Wiki" href="ext:wiki" /> @@ -182,6 +183,7 @@ <setprofiletaskrange href="#setProfileTaskRange(boolean,%20java.lang.String)" /> <setprofileparams href="#setProfileParams(java.lang.String)" /> <setnumtaskstoexecuteperjvm href="#setNumTasksToExecutePerJvm(int)" /> + <setqueuename href="#setQueueName(java.lang.String)" /> <getjoblocaldir href="#getJobLocalDir()" /> <getjar href="#getJar()" /> </jobconf>
