diff options
author | Sean Owen <sowen@cloudera.com> | 2016-06-12 11:46:33 -0700 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2016-06-12 11:46:33 -0700 |
commit | 0a6f090837d8d5f6efa809fa976f09b3f0067602 (patch) | |
tree | 4d00a516324f0b9b305dbb81e3a0fe65f5780633 /core/src | |
parent | f51dfe616b24b4234199c98ea857a586a93a889f (diff) | |
download | spark-0a6f090837d8d5f6efa809fa976f09b3f0067602.tar.gz spark-0a6f090837d8d5f6efa809fa976f09b3f0067602.tar.bz2 spark-0a6f090837d8d5f6efa809fa976f09b3f0067602.zip |
[SPARK-15876][CORE] Remove support for "zk://" master URL
## What changes were proposed in this pull request?
Remove deprecated support for `zk://` master (`mesos://zk//` remains supported)
## How was this patch tested?
Jenkins
Author: Sean Owen <sowen@cloudera.com>
Closes #13625 from srowen/SPARK-15876.
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/main/scala/org/apache/spark/SparkContext.scala | 6 | ||||
-rw-r--r-- | core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index 8bfe7ecd8f..3c5498782c 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -2417,7 +2417,6 @@ object SparkContext extends Logging { * Create a task scheduler based on a given master URL. * Return a 2-tuple of the scheduler backend and the task scheduler. */ - @tailrec private def createTaskScheduler( sc: SparkContext, master: String, @@ -2495,11 +2494,6 @@ object SparkContext extends Logging { scheduler.initialize(backend) (backend, scheduler) - case zkUrl if zkUrl.startsWith("zk://") => - logWarning("Master URL for a multi-master Mesos cluster managed by ZooKeeper should be " + - "in the form mesos://zk://host:port. Current Master URL will stop working in Spark 2.0.") - createTaskScheduler(sc, "mesos://" + zkUrl, deployMode) - case masterUrl => val cm = getClusterManager(masterUrl) match { case Some(clusterMgr) => clusterMgr diff --git a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala index 11be40abca..6e5655437a 100644 --- a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala +++ b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala @@ -157,8 +157,4 @@ class SparkContextSchedulerCreationSuite classOf[MesosFineGrainedSchedulerBackend], coarse = false) } - test("mesos with zookeeper and Master URL starting with zk://") { - testMesos("zk://localhost:1234,localhost:2345", - classOf[MesosFineGrainedSchedulerBackend], coarse = false) - } } |