You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by va...@apache.org on 2017/05/08 17:25:32 UTC
spark git commit: [SPARK-20621][DEPLOY] Delete deprecated config
parameter in 'spark-env.sh'
Repository: spark
Updated Branches:
refs/heads/master 58518d070 -> aeb2ecc0c
[SPARK-20621][DEPLOY] Delete deprecated config parameter in 'spark-env.sh'
## What changes were proposed in this pull request?
Currently, `spark.executor.instances` is deprecated in `spark-env.sh`, because we suggest config it in `spark-defaults.conf` or other config file. And also this parameter is useless even if you set it in `spark-env.sh`, so remove it in this patch.
## How was this patch tested?
Existing tests.
Please review http://spark.apache.org/contributing.html before opening a pull request.
Author: Xianyang Liu <xi...@intel.com>
Closes #17881 from ConeyLiu/deprecatedParam.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/aeb2ecc0
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/aeb2ecc0
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/aeb2ecc0
Branch: refs/heads/master
Commit: aeb2ecc0cd898f5352df0a04be1014b02ea3e20e
Parents: 58518d0
Author: Xianyang Liu <xi...@intel.com>
Authored: Mon May 8 10:25:24 2017 -0700
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Mon May 8 10:25:24 2017 -0700
----------------------------------------------------------------------
conf/spark-env.sh.template | 1 -
.../org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/aeb2ecc0/conf/spark-env.sh.template
----------------------------------------------------------------------
diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template
index 94bd2c4..b7c985a 100755
--- a/conf/spark-env.sh.template
+++ b/conf/spark-env.sh.template
@@ -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)
http://git-wip-us.apache.org/repos/asf/spark/blob/aeb2ecc0/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
----------------------------------------------------------------------
diff --git a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
index 9357885..0fc994d 100644
--- a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
+++ b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
@@ -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)
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org