Repository: spark Updated Branches: refs/heads/branch-2.0 e06f43e33 -> 4d2672a40
[SPARK-18114][MESOS] Fix mesos cluster scheduler generage command option error Enclose --conf option value with "" to support multi value configs like spark.driver.extraJavaOptions, without "", driver will fail to start. Jenkins Tests. Test in our production environment, also unit tests, It is a very small change. Author: Wang Lei <lei.w...@kongming-inc.com> Closes #15643 from LeightonWong/messos-cluster. (cherry picked from commit 9b377aa49f14af31f54164378d60e0fdea2142e5) Signed-off-by: Sean Owen <so...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4d2672a4 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4d2672a4 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4d2672a4 Branch: refs/heads/branch-2.0 Commit: 4d2672a408b6061b0e20b622960f7c6f14271275 Parents: e06f43e Author: Wang Lei <lei.w...@kongming-inc.com> Authored: Tue Nov 1 13:42:10 2016 +0000 Committer: Sean Owen <so...@cloudera.com> Committed: Tue Nov 1 13:43:47 2016 +0000 ---------------------------------------------------------------------- .../spark/scheduler/cluster/mesos/MesosClusterScheduler.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/4d2672a4/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala index 73bd4c5..cbf97c3 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala @@ -448,7 +448,7 @@ private[spark] class MesosClusterScheduler( } desc.schedulerProperties .filter { case (key, _) => !replicatedOptionsBlacklist.contains(key) } - .foreach { case (key, value) => options ++= Seq("--conf", s"$key=${shellEscape(value)}") } + .foreach { case (key, value) => options ++= Seq("--conf", s""""$key=${shellEscape(value)}"""".stripMargin) } options } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
