diff options
| author | Bijay Bisht <bijay.bisht@gmail.com> | 2014-02-16 16:52:57 -0800 |
|---|---|---|
| committer | Aaron Davidson <aaron@databricks.com> | 2014-02-16 16:54:03 -0800 |
| commit | 73cfdcfe71c3fdd4a9c5e71c8568f25371dab9bf (patch) | |
| tree | acbb664b791388e98fa3514f45ea96b4ee8922ab /core/src/main | |
| parent | 1cad3813879cf6a968cfbf427da37fbb4f39dc86 (diff) | |
| download | spark-73cfdcfe71c3fdd4a9c5e71c8568f25371dab9bf.tar.gz spark-73cfdcfe71c3fdd4a9c5e71c8568f25371dab9bf.tar.bz2 spark-73cfdcfe71c3fdd4a9c5e71c8568f25371dab9bf.zip | |
fix for https://spark-project.atlassian.net/browse/SPARK-1052
Author: Bijay Bisht <bijay.bisht@gmail.com>
Closes #568 from bijaybisht/SPARK-1052 and squashes the following commits:
da70395 [Bijay Bisht] fix for https://spark-project.atlassian.net/browse/SPARK-1052 - comments incorporated
fdb1d94 [Bijay Bisht] fix for https://spark-project.atlassian.net/browse/SPARK-1052
(cherry picked from commit e797c1abd9692f1b7ec290e4c83d31fd106e6b05)
Signed-off-by: Aaron Davidson <aaron@databricks.com>
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala index 49781485d9..fef291eea0 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala @@ -130,13 +130,8 @@ private[spark] class MesosSchedulerBackend( private def createExecArg(): Array[Byte] = { if (execArgs == null) { val props = new HashMap[String, String] - val iterator = System.getProperties.entrySet.iterator - while (iterator.hasNext) { - val entry = iterator.next - val (key, value) = (entry.getKey.toString, entry.getValue.toString) - if (key.startsWith("spark.")) { - props(key) = value - } + for ((key,value) <- sc.conf.getAll) { + props(key) = value } // Serialize the map as an array of (String, String) pairs execArgs = Utils.serialize(props.toArray) |