Repository: spark
Updated Branches:
  refs/heads/branch-1.5 0e4f58ed9 -> 51406becc


[SPARK-9737] [YARN] Add the suggested configuration when required executor 
memory is above the max threshold of this cluster on YARN mode

Author: Yadong Qi <qiyadong2...@gmail.com>

Closes #8028 from watermen/SPARK-9737 and squashes the following commits:

48bdf3d [Yadong Qi] Add suggested configuration.

(cherry picked from commit 86fa4ba6d13f909cb508b7cb3b153d586fe59bc3)
Signed-off-by: Reynold Xin <r...@databricks.com>


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

Branch: refs/heads/branch-1.5
Commit: 51406becc78857dbc36c3330f3afe8dd5926dc2f
Parents: 0e4f58e
Author: Yadong Qi <qiyadong2...@gmail.com>
Authored: Sun Aug 9 19:54:05 2015 +0100
Committer: Reynold Xin <r...@databricks.com>
Committed: Mon Aug 10 15:40:01 2015 -0700

----------------------------------------------------------------------
 yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/51406bec/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
----------------------------------------------------------------------
diff --git a/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala 
b/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
index fc11bbf..b4ba3f0 100644
--- a/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
+++ b/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -203,12 +203,14 @@ private[spark] class Client(
     val executorMem = args.executorMemory + executorMemoryOverhead
     if (executorMem > maxMem) {
       throw new IllegalArgumentException(s"Required executor memory 
(${args.executorMemory}" +
-        s"+$executorMemoryOverhead MB) is above the max threshold ($maxMem MB) 
of this cluster!")
+        s"+$executorMemoryOverhead MB) is above the max threshold ($maxMem MB) 
of this cluster! " +
+        "Please increase the value of 'yarn.scheduler.maximum-allocation-mb'.")
     }
     val amMem = args.amMemory + amMemoryOverhead
     if (amMem > maxMem) {
       throw new IllegalArgumentException(s"Required AM memory 
(${args.amMemory}" +
-        s"+$amMemoryOverhead MB) is above the max threshold ($maxMem MB) of 
this cluster!")
+        s"+$amMemoryOverhead MB) is above the max threshold ($maxMem MB) of 
this cluster! " +
+        "Please increase the value of 'yarn.scheduler.maximum-allocation-mb'.")
     }
     logInfo("Will allocate AM container, with %d MB memory including %d MB 
overhead".format(
       amMem,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to