Skip to content
Snippets Groups Projects
Commit 0700d192 authored by Denny's avatar Denny
Browse files

Protect from null env variables in mesos.

parent 21047d92
No related branches found
No related tags found
No related merge requests found
...@@ -114,11 +114,15 @@ private[spark] class CoarseMesosSchedulerBackend( ...@@ -114,11 +114,15 @@ private[spark] class CoarseMesosSchedulerBackend(
val command = "\"%s\" spark.executor.StandaloneExecutorBackend %s %s %s %d".format( val command = "\"%s\" spark.executor.StandaloneExecutorBackend %s %s %s %d".format(
runScript, masterUrl, offer.getSlaveId.getValue, offer.getHostname, numCores) runScript, masterUrl, offer.getSlaveId.getValue, offer.getHostname, numCores)
val environment = Environment.newBuilder() val environment = Environment.newBuilder()
sc.executorEnvs.foreach { case(k,v) => sc.executorEnvs.foreach { case(key, value) =>
environment.addVariables(Environment.Variable.newBuilder() if (value == null) {
.setName(k) logInfo("Environment variable not set: " + key)
.setValue(v) } else {
environment.addVariables(Environment.Variable.newBuilder()
.setName(key)
.setValue(value)
.build()) .build())
}
} }
return CommandInfo.newBuilder().setValue(command).setEnvironment(environment).build() return CommandInfo.newBuilder().setValue(command).setEnvironment(environment).build()
} }
......
...@@ -85,11 +85,15 @@ private[spark] class MesosSchedulerBackend( ...@@ -85,11 +85,15 @@ private[spark] class MesosSchedulerBackend(
} }
val execScript = new File(sparkHome, "spark-executor").getCanonicalPath val execScript = new File(sparkHome, "spark-executor").getCanonicalPath
val environment = Environment.newBuilder() val environment = Environment.newBuilder()
sc.executorEnvs.foreach { case(k,v) => sc.executorEnvs.foreach { case(key, value) =>
environment.addVariables(Environment.Variable.newBuilder() if (value == null) {
.setName(k) logInfo("Environment variable not set: " + key)
.setValue(v) } else {
environment.addVariables(Environment.Variable.newBuilder()
.setName(key)
.setValue(value)
.build()) .build())
}
} }
val memory = Resource.newBuilder() val memory = Resource.newBuilder()
.setName("mem") .setName("mem")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment