Repository: hadoop Updated Branches: refs/heads/branch-2 c9824c5ff -> 9f0b81335
YARN-6106. Document FairScheduler 'allowPreemptionFrom' queue property. (Yufei Gu via rchiang) (cherry picked from commit 3f970ac363dc2faf4f54180ee5b64d0c60807097) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9f0b8133 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9f0b8133 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9f0b8133 Branch: refs/heads/branch-2 Commit: 9f0b813350c61dfb807c893e1b22de1f01ba71bb Parents: c9824c5 Author: Ray Chiang <rchi...@apache.org> Authored: Fri Jan 20 14:04:10 2017 -0800 Committer: Ray Chiang <rchi...@apache.org> Committed: Mon Jan 30 13:42:11 2017 -0800 ---------------------------------------------------------------------- .../hadoop-yarn-site/src/site/markdown/FairScheduler.md | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f0b8133/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/FairScheduler.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/FairScheduler.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/FairScheduler.md index 91e7d8d..bcf56cb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/FairScheduler.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/FairScheduler.md @@ -117,6 +117,8 @@ The allocation file must be in XML format. The format contains five types of ele * fairSharePreemptionThreshold: the fair share preemption threshold for the queue. If the queue waits fairSharePreemptionTimeout without receiving fairSharePreemptionThreshold\*fairShare resources, it is allowed to preempt containers to take resources from other queues. If not set, the queue will inherit the value from its parent queue. + * allowPreemptionFrom: determines whether the scheduler is allowed to preempt resources from the queue. The default is true. If a queue has this property set to false, this property will apply recursively to all child queues. + * **User elements**: which represent settings governing the behavior of individual users. They can contain a single property: maxRunningApps, a limit on the number of running apps for a particular user. * **A userMaxAppsDefault element**: which sets the default running app limit for any users whose limit is not otherwise specified. --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
