You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2016/02/18 03:39:26 UTC

hadoop git commit: YARN-4569. Remove incorrect part of maxResources in FairScheduler documentation. (Ray Chiang via kasha)

Repository: hadoop
Updated Branches:
  refs/heads/trunk 1c248ea4a -> a0c95b5fc


YARN-4569. Remove incorrect part of maxResources in FairScheduler documentation. (Ray Chiang via kasha)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a0c95b5f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a0c95b5f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a0c95b5f

Branch: refs/heads/trunk
Commit: a0c95b5fc4c90ee3383619156619a66dfba889f7
Parents: 1c248ea
Author: Karthik Kambatla <ka...@apache.org>
Authored: Wed Feb 17 18:36:12 2016 -0800
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Wed Feb 17 18:36:12 2016 -0800

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                   | 3 +++
 .../hadoop-yarn-site/src/site/markdown/FairScheduler.md           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a0c95b5f/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 4471912..c172054 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -211,6 +211,9 @@ Release 2.9.0 - UNRELEASED
     YARN-4684. TestYarnCLI#testGetContainers failing in CN locale.
     (Bibin A Chundatt via vvasudev)
 
+    YARN-4569. Remove incorrect part of maxResources in FairScheduler
+    documentation. (Ray Chiang via kasha)
+
 Release 2.8.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a0c95b5f/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 26c6d22..c9c820f 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
@@ -96,7 +96,7 @@ The allocation file must be in XML format. The format contains five types of ele
 
     * minResources: minimum resources the queue is entitled to, in the form "X mb, Y vcores". For the single-resource fairness policy, the vcores value is ignored. If a queue's minimum share is not satisfied, it will be offered available resources before any other queue under the same parent. Under the single-resource fairness policy, a queue is considered unsatisfied if its memory usage is below its minimum memory share. Under dominant resource fairness, a queue is considered unsatisfied if its usage for its dominant resource with respect to the cluster capacity is below its minimum share for that resource. If multiple queues are unsatisfied in this situation, resources go to the queue with the smallest ratio between relevant resource usage and minimum. Note that it is possible that a queue that is below its minimum may not immediately get up to its minimum when it submits an application, because already-running jobs may be using those resources.
 
-    * maxResources: maximum resources a queue is allowed, in the form "X mb, Y vcores". For the single-resource fairness policy, the vcores value is ignored. A queue will never be assigned a container that would put its aggregate usage over this limit.
+    * maxResources: maximum resources a queue is allowed, in the form "X mb, Y vcores". A queue will never be assigned a container that would put its aggregate usage over this limit.
 
     * maxRunningApps: limit the number of apps from the queue to run at once