Author: sandy
Date: Wed Feb 19 21:30:30 2014
New Revision: 1569924
URL: http://svn.apache.org/r1569924
Log:
YARN-1171. Add default queue properties to Fair Scheduler documentation (Naren
Koneru via Sandy Ryza)
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1569924&r1=1569923&r2=1569924&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Wed Feb 19
21:30:30 2014
@@ -191,6 +191,9 @@ Release 2.4.0 - UNRELEASED
available across RM failover by making using of a remote
configuration-provider. (Xuan Gong via vinodkv)
+ YARN-1171. Add default queue properties to Fair Scheduler documentation
+ (Naren Koneru via Sandy Ryza)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm?rev=1569924&r1=1569923&r2=1569924&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
Wed Feb 19 21:30:30 2014
@@ -265,7 +265,15 @@ Allocation file format
its fair share before it will try to preempt containers to take resources
from
other queues.
- * <<A defaultQueueSchedulingPolicy element>>, which sets the default
scheduling
+ * <<A defaultMinSharePreemptionTimeout element>>, which sets the default
number
+ of seconds the queue is under its minimum share before it will try to
preempt
+ containers to take resources from other queues; overriden by
+ minSharePreemptionTimeout element in each queue if specified.
+
+ * <<A queueMaxAppsDefault element>>, which sets the default running app limit
+ for queues; overriden by maxRunningApps element in each queue.
+
+ * <<A defaultQueueSchedulingPolicy element>>, which sets the default
scheduling
policy for queues; overriden by the schedulingPolicy element in each queue
if specified. Defaults to "fair".
