diff options
| author | Matei Zaharia <matei@databricks.com> | 2013-12-28 17:31:58 -0500 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2013-12-28 17:31:58 -0500 |
| commit | 5bbe73864eea78b76448ce42a7af847dad73b269 (patch) | |
| tree | 5cebfd185f1ddd27226db6290a81d348ba3bbb5f | |
| parent | a16c52ed1bf5b416c9ec8c13dbe84ee203032b1b (diff) | |
| download | spark-5bbe73864eea78b76448ce42a7af847dad73b269.tar.gz spark-5bbe73864eea78b76448ce42a7af847dad73b269.tar.bz2 spark-5bbe73864eea78b76448ce42a7af847dad73b269.zip | |
Fix Executor not getting properties in local mode
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkConf.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/scheduler/local/LocalScheduler.scala | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala index 185ddb1fe5..bd24cd19f2 100644 --- a/core/src/main/scala/org/apache/spark/SparkConf.scala +++ b/core/src/main/scala/org/apache/spark/SparkConf.scala @@ -28,7 +28,7 @@ class SparkConf(loadDefaults: Boolean) extends Serializable with Cloneable { if (loadDefaults) { val typesafeConfig = ConfigFactory.systemProperties() .withFallback(ConfigFactory.parseResources("spark.conf")) - for (e <- typesafeConfig.entrySet().asScala) { + for (e <- typesafeConfig.entrySet().asScala if e.getKey.startsWith("spark.")) { settings(e.getKey) = e.getValue.unwrapped.toString } } diff --git a/core/src/main/scala/org/apache/spark/scheduler/local/LocalScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/local/LocalScheduler.scala index 8498cffd31..7c173e3ad5 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/local/LocalScheduler.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/local/LocalScheduler.scala @@ -50,7 +50,8 @@ private[spark] class LocalActor(localScheduler: LocalScheduler, private var freeCores: Int) extends Actor with Logging { - val executor = new Executor("localhost", "localhost", Seq.empty, isLocal = true) + val executor = new Executor( + "localhost", "localhost", localScheduler.sc.conf.getAll, isLocal = true) def receive = { case LocalReviveOffers => |