Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A4F5A200C0C for ; Mon, 30 Jan 2017 22:45:30 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A3988160B4D; Mon, 30 Jan 2017 21:45:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EEDB7160B35 for ; Mon, 30 Jan 2017 22:45:29 +0100 (CET) Received: (qmail 64635 invoked by uid 500); 30 Jan 2017 21:45:29 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 64626 invoked by uid 99); 30 Jan 2017 21:45:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jan 2017 21:45:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 04A8BDFCC2; Mon, 30 Jan 2017 21:45:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rchiang@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-6106. Document FairScheduler 'allowPreemptionFrom' queue property. (Yufei Gu via rchiang) Date: Mon, 30 Jan 2017 21:45:29 +0000 (UTC) archived-at: Mon, 30 Jan 2017 21:45:30 -0000 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 Authored: Fri Jan 20 14:04:10 2017 -0800 Committer: Ray Chiang 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-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org