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 ji...@apache.org on 2015/01/07 19:57:50 UTC

hadoop git commit: YARN-2230. Fixed few configs description in yarn-default.xml. Contributed by Vijay Bhat (cherry picked from commit fe8d2bd74175e7ad521bc310c41a367c0946d6ec)

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 36367209a -> 492717cbf


YARN-2230. Fixed few configs description in yarn-default.xml. Contributed by Vijay Bhat
(cherry picked from commit fe8d2bd74175e7ad521bc310c41a367c0946d6ec)


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

Branch: refs/heads/branch-2
Commit: 492717cbf5765654c8c10eea071f39ecc2ea99d8
Parents: 3636720
Author: Jian He <ji...@apache.org>
Authored: Wed Jan 7 10:57:06 2015 -0800
Committer: Jian He <ji...@apache.org>
Committed: Wed Jan 7 10:57:41 2015 -0800

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                     |  3 +++
 .../src/main/resources/yarn-default.xml             | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/492717cb/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 147b4d1..c477db7 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -293,6 +293,9 @@ Release 2.7.0 - UNRELEASED
     YARN-2978. Fixed potential NPE while getting queue info. (Varun Saxena via
     jianhe)
 
+    YARN-2230. Fixed few configs description in yarn-default.xml. (Vijay Bhat
+    via jianhe)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/492717cb/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index ea6c4fe..171e561 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -229,32 +229,32 @@
 
   <property>
     <description>The minimum allocation for every container request at the RM,
-    in MBs. Memory requests lower than this won't take effect,
-    and the specified value will get allocated at minimum.</description>
+    in MBs. Memory requests lower than this will throw a
+    InvalidResourceRequestException.</description>
     <name>yarn.scheduler.minimum-allocation-mb</name>
     <value>1024</value>
   </property>
 
   <property>
     <description>The maximum allocation for every container request at the RM,
-    in MBs. Memory requests higher than this won't take effect,
-    and will get capped to this value.</description>
+    in MBs. Memory requests higher than this will throw a
+    InvalidResourceRequestException.</description>
     <name>yarn.scheduler.maximum-allocation-mb</name>
     <value>8192</value>
   </property>
 
   <property>
     <description>The minimum allocation for every container request at the RM,
-    in terms of virtual CPU cores. Requests lower than this won't take effect,
-    and the specified value will get allocated the minimum.</description>
+    in terms of virtual CPU cores. Requests lower than this will throw a
+    InvalidResourceRequestException.</description>
     <name>yarn.scheduler.minimum-allocation-vcores</name>
     <value>1</value>
   </property>
 
   <property>
     <description>The maximum allocation for every container request at the RM,
-    in terms of virtual CPU cores. Requests higher than this won't take effect,
-    and will get capped to this value.</description>
+    in terms of virtual CPU cores. Requests higher than this will throw a
+    InvalidResourceRequestException.</description>
     <name>yarn.scheduler.maximum-allocation-vcores</name>
     <value>32</value>
   </property>