Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge YARN-131 from trunk. Fix incorrect ACL properties in capacity scheduler documentation. (Contributed by Ahmed Radwan) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393263 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Siddharth Seth 2012-10-03 02:57:25 +00:00
parent 47f60c4951
commit 9f3f66375e
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -29,6 +29,9 @@ Release 2.0.3-alpha - Unreleased
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES
YARN-131. Fix incorrect ACL properties in capacity scheduler documentation.
(Ahmed Radwan via sseth)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/resources/capacity-scheduler.xml
View File

@ -68,7 +68,7 @@
</property> </property>
<property> <property>
<name>yarn.scheduler.capacity.root.default.acl_submit_jobs</name> <name>yarn.scheduler.capacity.root.default.acl_submit_applications</name>
<value>*</value> <value>*</value>
<description> <description>
The ACL of who can submit jobs to the default queue. The ACL of who can submit jobs to the default queue.
@ -76,22 +76,13 @@
</property> </property>
<property> <property>
<name>yarn.scheduler.capacity.root.default.acl_administer_jobs</name> <name>yarn.scheduler.capacity.root.default.acl_administer_queue</name>
<value>*</value> <value>*</value>
<description> <description>
The ACL of who can administer jobs on the default queue. The ACL of who can administer jobs on the default queue.
</description> </description>
</property> </property>
<property>
<name>yarn.scheduler.capacity.root.acl_administer_queues</name>
<value>*</value>
<description>
The ACL for who can administer this queue i.e. change sub-queue
allocations.
</description>
</property>
<property> <property>
<name>yarn.scheduler.capacity.node-locality-delay</name> <name>yarn.scheduler.capacity.node-locality-delay</name>
<value>-1</value> <value>-1</value>

12
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm
View File

@ -278,17 +278,17 @@ Hadoop MapReduce Next Generation - Capacity Scheduler
| | Existing applications continue to completion, thus the queue can be | | Existing applications continue to completion, thus the queue can be
| | <drained> gracefully. | | | <drained> gracefully. |
*--------------------------------------+--------------------------------------+ *--------------------------------------+--------------------------------------+
| <<<yarn.scheduler.capacity.root.<queue-path>.acl_submit_jobs>>> | | | <<<yarn.scheduler.capacity.root.<queue-path>.acl_submit_applications>>> | |
| | The <ACL> which controls who can <submit> jobs to the given queue. | | | The <ACL> which controls who can <submit> applications to the given queue. |
| | If the given user/group has necessary ACLs on the given queue or | | | If the given user/group has necessary ACLs on the given queue or |
| | <one of the parent queues in the hierarchy> they can submit jobs. | | | <one of the parent queues in the hierarchy> they can submit applications. |
| | <ACLs> for this property <are> inherited from the parent queue | | | <ACLs> for this property <are> inherited from the parent queue |
| | if not specified. | | | if not specified. |
*--------------------------------------+--------------------------------------+ *--------------------------------------+--------------------------------------+
| <<<yarn.scheduler.capacity.root.<queue-path>.acl_administer_jobs>>> | | | <<<yarn.scheduler.capacity.root.<queue-path>.acl_administer_queue>>> | |
| | The <ACL> which controls who can <administer> jobs on the given queue. | | | The <ACL> which controls who can <administer> applications on the given queue. |
| | If the given user/group has necessary ACLs on the given queue or | | | If the given user/group has necessary ACLs on the given queue or |
| | <one of the parent queues in the hierarchy> they can administer jobs. | | | <one of the parent queues in the hierarchy> they can administer applications. |
| | <ACLs> for this property <are> inherited from the parent queue | | | <ACLs> for this property <are> inherited from the parent queue |
| | if not specified. | | | if not specified. |
*--------------------------------------+--------------------------------------+ *--------------------------------------+--------------------------------------+