aboutsummaryrefslogtreecommitdiff
path: root/core/src/test/scala/org
diff options
context:
space:
mode:
authorMichael Gummelt <mgummelt@mesosphere.io>2016-08-11 11:36:20 +0100
committerSean Owen <sowen@cloudera.com>2016-08-11 11:36:20 +0100
commit4d496802f592dca96dada73b24afc93c668a7f26 (patch)
tree8869660babf04fd62d9472aab06865ea851a9f28 /core/src/test/scala/org
parent7186e8c3180b7f38250cf2f2de791472bf5325a5 (diff)
downloadspark-4d496802f592dca96dada73b24afc93c668a7f26.tar.gz
spark-4d496802f592dca96dada73b24afc93c668a7f26.tar.bz2
spark-4d496802f592dca96dada73b24afc93c668a7f26.zip
[SPARK-16952] don't lookup spark home directory when executor uri is set
## What changes were proposed in this pull request? remove requirement to set spark.mesos.executor.home when spark.executor.uri is used ## How was this patch tested? unit tests Author: Michael Gummelt <mgummelt@mesosphere.io> Closes #14552 from mgummelt/fix-spark-home.
Diffstat (limited to 'core/src/test/scala/org')
-rw-r--r--core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackendSuite.scala23
1 files changed, 21 insertions, 2 deletions
diff --git a/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackendSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackendSuite.scala
index 0e66979901..26a3ad49d0 100644
--- a/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackendSuite.scala
+++ b/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackendSuite.scala
@@ -370,6 +370,21 @@ class MesosCoarseGrainedSchedulerBackendSuite extends SparkFunSuite
verify(driverEndpoint, never()).askWithRetry(isA(classOf[RemoveExecutor]))(any[ClassTag[_]])
}
+ test("mesos supports spark.executor.uri") {
+ val url = "spark.spark.spark.com"
+ setBackend(Map(
+ "spark.executor.uri" -> url
+ ), false)
+
+ val (mem, cpu) = (backend.executorMemory(sc), 4)
+
+ val offer1 = createOffer("o1", "s1", mem, cpu)
+ backend.resourceOffers(driver, List(offer1).asJava)
+
+ val launchedTasks = verifyTaskLaunched(driver, "o1")
+ assert(launchedTasks.head.getCommand.getUrisList.asScala(0).getValue == url)
+ }
+
private def verifyDeclinedOffer(driver: SchedulerDriver,
offerId: OfferID,
filter: Boolean = false): Unit = {
@@ -435,13 +450,17 @@ class MesosCoarseGrainedSchedulerBackendSuite extends SparkFunSuite
backend
}
- private def setBackend(sparkConfVars: Map[String, String] = null) {
+ private def setBackend(sparkConfVars: Map[String, String] = null,
+ setHome: Boolean = true) {
sparkConf = (new SparkConf)
.setMaster("local[*]")
.setAppName("test-mesos-dynamic-alloc")
- .setSparkHome("/path")
.set("spark.mesos.driver.webui.url", "http://webui")
+ if (setHome) {
+ sparkConf.setSparkHome("/path")
+ }
+
if (sparkConfVars != null) {
sparkConf.setAll(sparkConfVars)
}