From a9d946d4df91c29ea86851bb1c5046e95dc80406 Mon Sep 17 00:00:00 2001
From: bibinchundatt <bibinchundatt@apache.org>
Date: Tue, 17 Jan 2017 14:14:03 +0530
Subject: [PATCH] YARN-6057. yarn.scheduler.minimum-allocation-* descriptions
 are incorrect about behavior when a request is out of bounds. Contributed by
 Julia Sommer.

---
 .../src/main/resources/yarn-default.xml       | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

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 f287db001e9..e1bdcc0327c 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
@@ -319,32 +319,35 @@
   </property>
 
   <property>
-    <description>The minimum allocation for every container request at the RM,
-    in MBs. Memory requests lower than this will throw a
-    InvalidResourceRequestException.</description>
+    <description>The minimum allocation for every container request at the RM
+    in MBs. Memory requests lower than this will be set to the value of this
+    property. Additionally, a node manager that is configured to have less memory
+    than this value will be shut down by the resource manager.</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 will throw a
+    <description>The maximum allocation for every container request at the RM
+    in MBs. Memory requests higher than this will throw an
     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 will throw a
-    InvalidResourceRequestException.</description>
+    <description>The minimum allocation for every container request at the RM
+    in terms of virtual CPU cores. Requests lower than this will be set to the
+    value of this property. Additionally, a node manager that is configured to
+    have fewer virtual cores than this value will be shut down by the resource
+    manager.</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 will throw a
+    <description>The maximum allocation for every container request at the RM
+    in terms of virtual CPU cores. Requests higher than this will throw an
     InvalidResourceRequestException.</description>
     <name>yarn.scheduler.maximum-allocation-vcores</name>
     <value>4</value>