Repository: hadoop Updated Branches: refs/heads/branch-2 3c86c6807 -> 6f5d555ad
YARN-2372. There are Chinese Characters in the FairScheduler's document (Fengdong Yu via aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6f5d555a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6f5d555a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6f5d555a Branch: refs/heads/branch-2 Commit: 6f5d555ad0caa3ea2f446aecb72b3e85b0ad81df Parents: 3c86c68 Author: Allen Wittenauer <[email protected]> Authored: Fri Sep 26 12:47:26 2014 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Fri Sep 26 12:47:26 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 ++ .../src/site/apt/FairScheduler.apt.vm | 30 ++++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6f5d555a/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index d7201aa..154f61d 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -229,6 +229,9 @@ Release 2.6.0 - UNRELEASED YARN-2577. Clarify ACL delimiter and how to configure ACL groups only (Miklos Christine via aw) + YARN-2372. There are Chinese Characters in the FairScheduler's document + (Fengdong Yu via aw) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/6f5d555a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm index e69fb4f..73ce660 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm @@ -44,7 +44,7 @@ Hadoop MapReduce Next Generation - Fair Scheduler The scheduler organizes apps further into "queues", and shares resources fairly between these queues. By default, all users share a single queue, - named âdefaultâ. If an app specifically lists a queue in a container resource + named "default". If an app specifically lists a queue in a container resource request, the request is submitted to that queue. It is also possible to assign queues based on the user name included with the request through configuration. Within each queue, a scheduling policy is used to share @@ -97,7 +97,7 @@ Hadoop MapReduce Next Generation - Fair Scheduler Certain add-ons are not yet supported which existed in the original (MR1) Fair Scheduler. Among them, is the use of a custom policies governing - priority âboostingâ over certain apps. + priority "boosting" over certain apps. * {Automatically placing applications in queues} @@ -217,7 +217,7 @@ Allocation file format elements: * <<Queue elements>>, which represent queues. Queue elements can take an optional - attribute âtypeâ,which when set to âparentâ makes it a parent queue. This is useful + attribute 'type', which when set to 'parent' makes it a parent queue. This is useful when we want to create a parent queue without configuring any leaf queues. Each queue element may contain the following properties: @@ -336,15 +336,15 @@ Allocation file format * nestedUserQueue : the app is placed into a queue with the name of the user under the queue suggested by the nested rule. This is similar to âuserâ - rule,the difference being in ânestedUserQueueâ rule,user queues can be created - under any parent queue, while âuserâ rule creates user queues only under root queue. + rule,the difference being in 'nestedUserQueue' rule,user queues can be created + under any parent queue, while 'user' rule creates user queues only under root queue. Note that nestedUserQueue rule would be applied only if the nested rule returns a - parent queue.One can configure a parent queue either by setting âtypeâ attribute of queue - to âparentâ or by configuring at least one leaf under that queue which makes it a parent. + parent queue.One can configure a parent queue either by setting 'type' attribute of queue + to 'parent' or by configuring at least one leaf under that queue which makes it a parent. See example allocation for a sample use case. - * default: the app is placed into the queue specified in the âqueueâ attribute of the - default rule. If âqueueâ attribute is not specified, the app is placed into âroot.defaultâ queue. + * default: the app is placed into the queue specified in the 'queue' attribute of the + default rule. If 'queue' attribute is not specified, the app is placed into 'root.default' queue. * reject: the app is rejected. @@ -368,9 +368,9 @@ Allocation file format <queueMaxAMShareDefault>0.5</queueMaxAMShareDefault> - <!â- Queue âsecondary_group_queueâ is a parent queue and may have - user queues under it -â> - <queue name=âsecondary_group_queueâ type=âparentâ> + <!â- Queue 'secondary_group_queueue' is a parent queue and may have + user queues under it --> + <queue name="secondary_group_queue" type="parent"> <weight>3.0</weight> </queue> @@ -382,10 +382,10 @@ Allocation file format <queuePlacementPolicy> <rule name="specified" /> <rule name="primaryGroup" create="false" /> - <rule name=ânestedUserQueueâ> - <rule name=âsecondaryGroupExistingQueueâ create=âfalseâ /> + <rule name="nestedUserQueue"> + <rule name="secondaryGroupExistingQueue" create="false" /> </rule> - <rule name="default" queue=âsample_queueâ /> + <rule name="default" queue="sample_queue"/> </queuePlacementPolicy> </allocations> ---
