diff options
| author | Matei Zaharia <matei@databricks.com> | 2014-01-01 22:09:42 -0500 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-01-01 22:09:42 -0500 |
| commit | 0f6060733da83a862038fd397875cdb49d8c144d (patch) | |
| tree | 8d236739a5d6d57d5d1be4b614c13f7493f64384 /core | |
| parent | e2c68642c64345434e2034082cf9b299491e9e9f (diff) | |
| download | spark-0f6060733da83a862038fd397875cdb49d8c144d.tar.gz spark-0f6060733da83a862038fd397875cdb49d8c144d.tar.bz2 spark-0f6060733da83a862038fd397875cdb49d8c144d.zip | |
Fixed two uses of conf.get with no default value in Mesos
Diffstat (limited to 'core')
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala index d247fa4244..08811520cf 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala @@ -125,7 +125,7 @@ private[spark] class CoarseMesosSchedulerBackend( conf.get("spark.driver.host"), conf.get("spark.driver.port"), CoarseGrainedSchedulerBackend.ACTOR_NAME) - val uri = conf.get("spark.executor.uri") + val uri = conf.get("spark.executor.uri", null) if (uri == null) { val runScript = new File(sparkHome, "spark-class").getCanonicalPath command.setValue( 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 c20fc418e8..bb278fb155 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 @@ -100,7 +100,7 @@ private[spark] class MesosSchedulerBackend( } val command = CommandInfo.newBuilder() .setEnvironment(environment) - val uri = sc.conf.get("spark.executor.uri") + val uri = sc.conf.get("spark.executor.uri", null) if (uri == null) { command.setValue(new File(sparkHome, "spark-executor").getCanonicalPath) } else { |