Skip to content

Commit b38dec2

Browse files
mohitgoyal557Andrew Or
authored and
Andrew Or
committed
[SPARK-5951][YARN] Remove unreachable driver memory properties in yarn client mode
Remove unreachable driver memory properties in yarn client mode Author: mohit.goyal <[email protected]> Closes apache#4730 from zuxqoj/master and squashes the following commits: 977dc96 [mohit.goyal] remove not rechable deprecated variables in yarn client mode
1 parent c871e2d commit b38dec2

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,12 @@ private[spark] class YarnClientSchedulerBackend(
7979
)
8080
// Warn against the following deprecated environment variables: env var -> suggestion
8181
val deprecatedEnvVars = Map(
82-
"SPARK_MASTER_MEMORY" -> "SPARK_DRIVER_MEMORY or --driver-memory through spark-submit",
8382
"SPARK_WORKER_INSTANCES" -> "SPARK_WORKER_INSTANCES or --num-executors through spark-submit",
8483
"SPARK_WORKER_MEMORY" -> "SPARK_EXECUTOR_MEMORY or --executor-memory through spark-submit",
8584
"SPARK_WORKER_CORES" -> "SPARK_EXECUTOR_CORES or --executor-cores through spark-submit")
86-
// Do the same for deprecated properties: property -> suggestion
87-
val deprecatedProps = Map("spark.master.memory" -> "--driver-memory through spark-submit")
8885
optionTuples.foreach { case (optionName, envVar, sparkProp) =>
8986
if (sc.getConf.contains(sparkProp)) {
9087
extraArgs += (optionName, sc.getConf.get(sparkProp))
91-
if (deprecatedProps.contains(sparkProp)) {
92-
logWarning(s"NOTE: $sparkProp is deprecated. Use ${deprecatedProps(sparkProp)} instead.")
93-
}
9488
} else if (System.getenv(envVar) != null) {
9589
extraArgs += (optionName, System.getenv(envVar))
9690
if (deprecatedEnvVars.contains(envVar)) {

0 commit comments

Comments
 (0)