WIP using exec-style Mesos command.

dragos · Feb 16, 2016 · a6f9df1 · a6f9df1 · jayv · Feb 16, 2016
1 parent 4b2b8b1
commit a6f9df1
Showing 1 changed file with 8 additions and 3 deletions.
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
@@ -400,9 +400,14 @@ private[spark] class MesosClusterScheduler(
       (cmdExecutable, ".")
     }
     val primaryResource = new File(sandboxPath, desc.jarUrl.split("/").last).toString()
-    val cmdOptions = generateCmdOption(desc, sandboxPath).mkString(" ")
-    val appArguments = desc.command.arguments.mkString(" ")
-    builder.setValue(s"$executable $cmdOptions $primaryResource $appArguments")
+    val cmdOptions = generateCmdOption(desc, sandboxPath)
+    val appArguments = desc.command.arguments
+
+    builder.setShell(false)
+    for (arg <- cmdOptions ++ Seq(primaryResource) ++ appArguments) {
+      builder.addArguments(arg)
+    }
+    builder.setValue(executable)
     builder.setEnvironment(envBuilder.build())
     conf.getOption("spark.mesos.uris").map { uris =>
       setupUris(uris, builder)