From e30ffac5bf34f3b9f626cbc159293dd829a0a286 Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Wed, 24 Sep 2014 17:43:21 -0700 Subject: [PATCH 1/2] Remove outdated memory checks --- .../org/apache/spark/deploy/yarn/ClientArguments.scala | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala index 201b742736c6e..bf01094bc0dee 100644 --- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala +++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala @@ -69,12 +69,8 @@ private[spark] class ClientArguments(args: Array[String], sparkConf: SparkConf) * This is intended to be called only after the provided arguments have been parsed. */ private def validateArgs(): Unit = { - // TODO: memory checks are outdated (SPARK-3476) Map[Boolean, String]( - (numExecutors <= 0) -> "You must specify at least 1 executor!", - (amMemory <= amMemoryOverhead) -> s"AM memory must be > $amMemoryOverhead MB", - (executorMemory <= executorMemoryOverhead) -> - s"Executor memory must be > $executorMemoryOverhead MB" + (numExecutors <= 0) -> "You must specify at least 1 executor!" ).foreach { case (errorCondition, errorMessage) => if (errorCondition) { throw new IllegalArgumentException(errorMessage + "\n" + getUsageMessage()) From c5400cd278facab5889cfe8531ecccbadff035f4 Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Thu, 25 Sep 2014 10:52:05 -0700 Subject: [PATCH 2/2] Simplify checks --- .../org/apache/spark/deploy/yarn/ClientArguments.scala | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala index bf01094bc0dee..26dbd6237c6b8 100644 --- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala +++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala @@ -69,12 +69,9 @@ private[spark] class ClientArguments(args: Array[String], sparkConf: SparkConf) * This is intended to be called only after the provided arguments have been parsed. */ private def validateArgs(): Unit = { - Map[Boolean, String]( - (numExecutors <= 0) -> "You must specify at least 1 executor!" - ).foreach { case (errorCondition, errorMessage) => - if (errorCondition) { - throw new IllegalArgumentException(errorMessage + "\n" + getUsageMessage()) - } + if (numExecutors <= 0) { + throw new IllegalArgumentException( + "You must specify at least 1 executor!\n" + getUsageMessage()) } }