Skip to content

[SPARK-20621][deploy]Delete deprecated config parameter in 'spark-env.sh' #17881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ConeyLiu wants to merge 1 commit into from
Closed

[SPARK-20621][deploy]Delete deprecated config parameter in 'spark-env.sh' #17881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Remove the deprecated configure parameter from 'spark-env.sh'
  • Loading branch information
@ConeyLiu
ConeyLiu committed May 6, 2017
commit 50b4f2d2269f03f3650443405a28546843f98f53
1 change: 0 additions & 1 deletion conf/spark-env.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

# Options read in YARN client mode
# - HADOOP_CONF_DIR, to point Spark towards Hadoop configuration files
# - SPARK_EXECUTOR_INSTANCES, Number of executors to start (Default: 2)
# - SPARK_EXECUTOR_CORES, Number of cores for the executors (Default: 1).
# - SPARK_EXECUTOR_MEMORY, Memory per Executor (e.g. 1000M, 2G) (Default: 1G)
# - SPARK_DRIVER_MEMORY, Memory for Driver (e.g. 1000M, 2G) (Default: 1G)
Expand Down
5 changes: 1 addition & 4 deletions resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,7 @@ object YarnSparkHadoopUtil {

initialNumExecutors
} else {
val targetNumExecutors =
sys.env.get("SPARK_EXECUTOR_INSTANCES").map(_.toInt).getOrElse(numExecutors)
// System property can override environment variable.
conf.get(EXECUTOR_INSTANCES).getOrElse(targetNumExecutors)
conf.get(EXECUTOR_INSTANCES).getOrElse(numExecutors)
}
}
}
Expand Down