You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/13 02:01:21 UTC
[1/2] git commit: Setting load defaults to true in executor
Updated Branches:
refs/heads/master 82e2b92c6 -> 074f50232
Setting load defaults to true in executor
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/cfb1e6c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/cfb1e6c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/cfb1e6c1
Branch: refs/heads/master
Commit: cfb1e6c13cd9021e29abe38edceded4b988fbe5b
Parents: 288a878
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Jan 12 15:20:16 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Jan 12 15:35:08 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/executor/Executor.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/cfb1e6c1/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 a7b2328..7f31d7e 100644
--- a/core/src/main/scala/org/apache/spark/executor/Executor.scala
+++ b/core/src/main/scala/org/apache/spark/executor/Executor.scala
@@ -57,7 +57,7 @@ private[spark] class Executor(
Utils.setCustomHostname(slaveHostname)
// Set spark.* properties from executor arg
- val conf = new SparkConf(false)
+ val conf = new SparkConf(true)
conf.setAll(properties)
// If we are in yarn mode, systems can have different disk layouts so we must set it
[2/2] git commit: Merge pull request #396 from pwendell/executor-env
Posted by pw...@apache.org.
Merge pull request #396 from pwendell/executor-env
Setting load defaults to true in executor
This preserves the behavior in earlier releases. If properties are set for the executors via `spark-env.sh` on the slaves, then they should take precedence over spark defaults. This is useful for if system administrators are setting properties for a standalone cluster, such as shuffle locations.
/cc @andrewor14 who initially reported this issue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/074f5023
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/074f5023
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/074f5023
Branch: refs/heads/master
Commit: 074f50232fd8d8cf05eb88db0ac6f03f61452810
Parents: 82e2b92 cfb1e6c
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Jan 12 17:01:13 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Jan 12 17:01:13 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/executor/Executor.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------