Repository: spark Updated Branches: refs/heads/branch-1.2 6b227413d -> 17b7cc733
[SPARK-5417] Remove redundant executor-id set() call This happens inside SparkEnv initialization as of #4194 Author: Ryan Williams <ryan.blake.willi...@gmail.com> Closes #4213 from ryan-williams/exec-id-set and squashes the following commits: b3e4f7b [Ryan Williams] Remove redundant executor-id set() call Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/17b7cc73 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/17b7cc73 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/17b7cc73 Branch: refs/heads/branch-1.2 Commit: 17b7cc7332c4f89dcdf9ec457c3f825605bf59e9 Parents: 6b22741 Author: Ryan Williams <ryan.blake.willi...@gmail.com> Authored: Wed Jan 28 13:04:52 2015 -0800 Committer: Sean Owen <so...@cloudera.com> Committed: Fri Feb 27 15:20:48 2015 +0000 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/executor/Executor.scala | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/17b7cc73/core/src/main/scala/org/apache/spark/executor/Executor.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/executor/Executor.scala b/core/src/main/scala/org/apache/spark/executor/Executor.scala index eaf0c82..8effb59 100644 --- a/core/src/main/scala/org/apache/spark/executor/Executor.scala +++ b/core/src/main/scala/org/apache/spark/executor/Executor.scala @@ -81,8 +81,6 @@ private[spark] class Executor( val executorSource = new ExecutorSource(this, executorId) - // Initialize Spark environment (using system properties read above) - conf.set("spark.executor.id", executorId) private val env = { if (!isLocal) { val port = conf.getInt("spark.executor.port", 0) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
