Repository: incubator-spark Updated Branches: refs/heads/branch-0.9 19b4bb2b4 -> e797c1abd
fix for https://spark-project.atlassian.net/browse/SPARK-1052 Author: Bijay Bisht <bijay.bi...@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 Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/e797c1ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/e797c1ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/e797c1ab Branch: refs/heads/branch-0.9 Commit: e797c1abd9692f1b7ec290e4c83d31fd106e6b05 Parents: 19b4bb2 Author: Bijay Bisht <bijay.bi...@gmail.com> Authored: Sun Feb 16 16:52:57 2014 -0800 Committer: Aaron Davidson <aa...@databricks.com> Committed: Sun Feb 16 16:52:57 2014 -0800 ---------------------------------------------------------------------- .../scheduler/cluster/mesos/MesosSchedulerBackend.scala | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e797c1ab/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala ---------------------------------------------------------------------- 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 4978148..fef291e 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)
