You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2014/09/26 20:50:54 UTC
git commit: [SPARK-3476] Remove outdated memory checks in Yarn
Repository: spark
Updated Branches:
refs/heads/master 30461c6ac -> 8da10bf14
[SPARK-3476] Remove outdated memory checks in Yarn
See description in [JIRA](https://issues.apache.org/jira/browse/SPARK-3476).
Author: Andrew Or <an...@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
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8da10bf1
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8da10bf1
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8da10bf1
Branch: refs/heads/master
Commit: 8da10bf14660f1d5b1dab692cb56b9832ab10d40
Parents: 30461c6
Author: Andrew Or <an...@gmail.com>
Authored: Fri Sep 26 11:50:48 2014 -0700
Committer: Andrew Or <an...@gmail.com>
Committed: Fri Sep 26 11:50:48 2014 -0700
----------------------------------------------------------------------
.../org/apache/spark/deploy/yarn/ClientArguments.scala | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/8da10bf1/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
----------------------------------------------------------------------
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 201b742..26dbd62 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())
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org