diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-10-24 21:52:13 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-10-24 21:52:13 -0700 |
| commit | f63a40fd99bf907c03cd44585fd5979bf21b304d (patch) | |
| tree | f5660bf8ad76eb894653a38f55e2a57dd3d9904c | |
| parent | d290e964ea190e6e782461134119fa6d1f90301f (diff) | |
| download | spark-f63a40fd99bf907c03cd44585fd5979bf21b304d.tar.gz spark-f63a40fd99bf907c03cd44585fd5979bf21b304d.tar.bz2 spark-f63a40fd99bf907c03cd44585fd5979bf21b304d.zip | |
Strip leading mesos:// in URLs passed to Mesos
| -rw-r--r-- | core/src/main/scala/spark/SparkContext.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/SparkContext.scala b/core/src/main/scala/spark/SparkContext.scala index 4975e2a9fc..d26cccbfe1 100644 --- a/core/src/main/scala/spark/SparkContext.scala +++ b/core/src/main/scala/spark/SparkContext.scala @@ -173,10 +173,11 @@ class SparkContext( MesosNativeLibrary.load() val scheduler = new ClusterScheduler(this) val coarseGrained = System.getProperty("spark.mesos.coarse", "false").toBoolean + val masterWithoutProtocol = master.replaceFirst("^mesos://", "") // Strip initial mesos:// val backend = if (coarseGrained) { - new CoarseMesosSchedulerBackend(scheduler, this, master, jobName) + new CoarseMesosSchedulerBackend(scheduler, this, masterWithoutProtocol, jobName) } else { - new MesosSchedulerBackend(scheduler, this, master, jobName) + new MesosSchedulerBackend(scheduler, this, masterWithoutProtocol, jobName) } scheduler.initialize(backend) scheduler |