MAPREDUCE-2505. Explain how to use ACLs in the fair scheduler. Contributed by Matei Zaharia.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1124374 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 09a7208..b283261 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -395,6 +395,9 @@
MAPREDUCE-2103. task-controller shouldn't require o-r permissions.
(todd via eli)
+ MAPREDUCE-2505. Explain how to use ACLs in the fair scheduler.
+ (matei via eli)
+
OPTIMIZATIONS
MAPREDUCE-1354. Enhancements to JobTracker for better performance and
diff --git a/src/docs/src/documentation/content/xdocs/fair_scheduler.xml b/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
index 900dcc3..ff8431d 100644
--- a/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
+++ b/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
@@ -185,9 +185,9 @@
Specify which jobconf property is used to determine the pool that a
job belongs in. String, default: <em>mapreduce.job.user.name</em>
(i.e. one pool for each user).
- Another useful value is <em>group.name</em> to create a
- pool per Unix group.
- mapred.fairscheduler. poolnameproperty is used only for jobs in which
+ Another useful value is <em>mapreduce.job.queuename</em> to use MapReduce's "queue"
+ system for access control lists (see below).
+ mapred.fairscheduler.poolnameproperty is used only for jobs in which
mapred.fairscheduler.pool is not explicitly set.
</td>
</tr>
@@ -441,6 +441,29 @@
number of jobs.
</p>
</section>
+ <section>
+ <title>Access Control Lists (ACLs)</title>
+ <p>
+ The fair scheduler can be used in tandem with the "queue" based access
+ control system in MapReduce to restrict which pools each user can access.
+ To do this, first enable ACLs and set up some queues as described in the
+ <a href="mapred_tutorial.html#Job+Authorization">MapReduce usage guide</a>,
+ then set the fair scheduler to use one pool per queue by adding
+ the following property in <em>HADOOP_CONF_DIR/mapred-site.xml</em>:
+ </p>
+<source>
+<property>
+ <name>mapred.fairscheduler.poolnameproperty</name>
+ <value>mapreduce.job.queuename</value>
+</property>
+</source>
+ <p>
+ You can then set the minimum share, weight, and internal scheduling mode
+ for each pool as described earlier.
+ In addition, make sure that users submit jobs to the right queue by setting
+ the <em>mapreduce.job.queuename</em> property in their jobs.
+ </p>
+ </section>
</section>
<section>
<title> Administration</title>