vanzin closed pull request #20641: [SPARK-23464][MESOS] Fix mesos cluster
scheduler options double-escaping
URL: https://github.com/apache/spark/pull/20641
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/resource-managers/mesos/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala
b/resource-managers/mesos/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala
index d224a7325820a..3b4e3d5d9cb57 100644
---
a/resource-managers/mesos/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala
+++
b/resource-managers/mesos/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala
@@ -530,7 +530,7 @@ private[spark] class MesosClusterScheduler(
.filter { case (key, _) => !replicatedOptionsBlacklist.contains(key) }
.toMap
(defaultConf ++ driverConf).foreach { case (key, value) =>
- options ++= Seq("--conf",
s""""$key=${shellEscape(value)}"""".stripMargin) }
+ options ++= Seq("--conf", s"$key=${shellEscape(value)}") }
options
}
diff --git
a/resource-managers/mesos/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterSchedulerSuite.scala
b/resource-managers/mesos/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterSchedulerSuite.scala
index e534b9d7e3ed9..9d550a030f1bc 100644
---
a/resource-managers/mesos/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterSchedulerSuite.scala
+++
b/resource-managers/mesos/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterSchedulerSuite.scala
@@ -199,6 +199,38 @@ class MesosClusterSchedulerSuite extends SparkFunSuite
with LocalSparkContext wi
})
}
+ test("properly wraps and escapes parameters passed to driver command") {
+ setScheduler()
+
+ val mem = 1000
+ val cpu = 1
+
+ val response = scheduler.submitDriver(
+ new MesosDriverDescription("d1", "jar", mem, cpu, true,
+ command,
+ Map("spark.mesos.executor.home" -> "test",
+ "spark.app.name" -> "test",
+ // no special characters, wrap only
+ "spark.driver.extraJavaOptions" ->
+ "-XX+PrintGC -Dparam1=val1 -Dparam2=val2",
+ // special characters, to be escaped
+ "spark.executor.extraJavaOptions" ->
+ """-Dparam1="value 1" -Dparam2=value\ 2 -Dpath=$PATH"""),
+ "s1",
+ new Date()))
+ assert(response.success)
+
+ val offer = Utils.createOffer("o1", "s1", mem, cpu)
+ scheduler.resourceOffers(driver, List(offer).asJava)
+ val tasks = Utils.verifyTaskLaunched(driver, "o1")
+ val driverCmd = tasks.head.getCommand.getValue
+ assert(driverCmd.contains(
+ """--conf spark.driver.extraJavaOptions="-XX+PrintGC -Dparam1=val1
-Dparam2=val2""""))
+ assert(driverCmd.contains(
+ """--conf spark.executor.extraJavaOptions="""
+ + """"-Dparam1=\"value 1\" -Dparam2=value\\ 2 -Dpath=\$PATH""""))
+ }
+
test("supports spark.mesos.driverEnv.*") {
setScheduler()
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
