diff options
author | mohit.goyal <mohit.goyal@guavus.com> | 2015-02-26 14:27:47 -0800 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2015-02-26 14:27:47 -0800 |
commit | b38dec2ffdf724ff4e181cc8c7427d074b442670 (patch) | |
tree | 60e93c7a142ecb29bf705192f57b259737ac55ad /yarn | |
parent | c871e2dae0182e914135560d14304242e1f97f7e (diff) | |
download | spark-b38dec2ffdf724ff4e181cc8c7427d074b442670.tar.gz spark-b38dec2ffdf724ff4e181cc8c7427d074b442670.tar.bz2 spark-b38dec2ffdf724ff4e181cc8c7427d074b442670.zip |
[SPARK-5951][YARN] Remove unreachable driver memory properties in yarn client mode
Remove unreachable driver memory properties in yarn client mode
Author: mohit.goyal <mohit.goyal@guavus.com>
Closes #4730 from zuxqoj/master and squashes the following commits:
977dc96 [mohit.goyal] remove not rechable deprecated variables in yarn client mode
Diffstat (limited to 'yarn')
-rw-r--r-- | yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala b/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala index f1b5aafac4..8abdc26b43 100644 --- a/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala +++ b/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala @@ -79,18 +79,12 @@ private[spark] class YarnClientSchedulerBackend( ) // Warn against the following deprecated environment variables: env var -> suggestion val deprecatedEnvVars = Map( - "SPARK_MASTER_MEMORY" -> "SPARK_DRIVER_MEMORY or --driver-memory through spark-submit", "SPARK_WORKER_INSTANCES" -> "SPARK_WORKER_INSTANCES or --num-executors through spark-submit", "SPARK_WORKER_MEMORY" -> "SPARK_EXECUTOR_MEMORY or --executor-memory through spark-submit", "SPARK_WORKER_CORES" -> "SPARK_EXECUTOR_CORES or --executor-cores through spark-submit") - // Do the same for deprecated properties: property -> suggestion - val deprecatedProps = Map("spark.master.memory" -> "--driver-memory through spark-submit") optionTuples.foreach { case (optionName, envVar, sparkProp) => if (sc.getConf.contains(sparkProp)) { extraArgs += (optionName, sc.getConf.get(sparkProp)) - if (deprecatedProps.contains(sparkProp)) { - logWarning(s"NOTE: $sparkProp is deprecated. Use ${deprecatedProps(sparkProp)} instead.") - } } else if (System.getenv(envVar) != null) { extraArgs += (optionName, System.getenv(envVar)) if (deprecatedEnvVars.contains(envVar)) { |