You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/06/12 18:46:35 UTC
spark git commit: [SPARK-15876][CORE] Remove support for "zk://"
master URL
Repository: spark
Updated Branches:
refs/heads/master f51dfe616 -> 0a6f09083
[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 <so...@cloudera.com>
Closes #13625 from srowen/SPARK-15876.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0a6f0908
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0a6f0908
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0a6f0908
Branch: refs/heads/master
Commit: 0a6f090837d8d5f6efa809fa976f09b3f0067602
Parents: f51dfe6
Author: Sean Owen <so...@cloudera.com>
Authored: Sun Jun 12 11:46:33 2016 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Sun Jun 12 11:46:33 2016 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkContext.scala | 6 ------
.../org/apache/spark/SparkContextSchedulerCreationSuite.scala | 4 ----
2 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0a6f0908/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index 8bfe7ec..3c54987 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
http://git-wip-us.apache.org/repos/asf/spark/blob/0a6f0908/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala b/core/src/test/scala/org/apache/spark/SparkContextSchedulerCreationSuite.scala
index 11be40a..6e56554 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)
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org