aboutsummaryrefslogtreecommitdiff
path: root/yarn
diff options
context:
space:
mode:
authorAndrew Or <andrewor14@gmail.com>2014-09-26 11:50:48 -0700
committerAndrew Or <andrewor14@gmail.com>2014-09-26 11:50:48 -0700
commit8da10bf14660f1d5b1dab692cb56b9832ab10d40 (patch)
tree5afb8a279850ad8c7832ceb7de6deca11004a7bf /yarn
parent30461c6ac3dcfb05dc1891494ec161601c0fb59f (diff)
downloadspark-8da10bf14660f1d5b1dab692cb56b9832ab10d40.tar.gz
spark-8da10bf14660f1d5b1dab692cb56b9832ab10d40.tar.bz2
spark-8da10bf14660f1d5b1dab692cb56b9832ab10d40.zip
[SPARK-3476] Remove outdated memory checks in Yarn
See description in [JIRA](https://issues.apache.org/jira/browse/SPARK-3476). Author: Andrew Or <andrewor14@gmail.com> Closes #2528 from andrewor14/yarn-memory-checks and squashes the following commits: c5400cd [Andrew Or] Simplify checks e30ffac [Andrew Or] Remove outdated memory checks
Diffstat (limited to 'yarn')
-rw-r--r--yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala13
1 files changed, 3 insertions, 10 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 201b742736..26dbd6237c 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,16 +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 = {
- // 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"
- ).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())
}
}