Return-Path: X-Original-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3471310265 for ; Wed, 19 Feb 2014 21:38:53 +0000 (UTC) Received: (qmail 21965 invoked by uid 500); 19 Feb 2014 21:38:50 -0000 Delivered-To: apmail-hadoop-yarn-commits-archive@hadoop.apache.org Received: (qmail 21546 invoked by uid 500); 19 Feb 2014 21:38:50 -0000 Mailing-List: contact yarn-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: yarn-commits@hadoop.apache.org Delivered-To: mailing list yarn-commits@hadoop.apache.org Received: (qmail 21392 invoked by uid 99); 19 Feb 2014 21:38:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Feb 2014 21:38:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Feb 2014 21:38:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AD21F23888E2; Wed, 19 Feb 2014 21:38:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1569930 - in /hadoop/common/branches/branch-2.4/hadoop-yarn-project: CHANGES.txt hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm Date: Wed, 19 Feb 2014 21:38:27 -0000 To: yarn-commits@hadoop.apache.org From: sandy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140219213827.AD21F23888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sandy Date: Wed Feb 19 21:38:27 2014 New Revision: 1569930 URL: http://svn.apache.org/r1569930 Log: YARN-1171. Add default queue properties to Fair Scheduler documentation (Naren Koneru via Sandy Ryza) Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt?rev=1569930&r1=1569929&r2=1569930&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt Wed Feb 19 21:38:27 2014 @@ -177,6 +177,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.4/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.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm?rev=1569930&r1=1569929&r2=1569930&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm (original) +++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm Wed Feb 19 21:38:27 2014 @@ -265,7 +265,15 @@ Allocation file format its fair share before it will try to preempt containers to take resources from other queues. - * <>, which sets the default scheduling + * <>, 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. + + * <>, which sets the default running app limit + for queues; overriden by maxRunningApps element in each queue. + + * <>, which sets the default scheduling policy for queues; overriden by the schedulingPolicy element in each queue if specified. Defaults to "fair".