Skip to content

Commit 12c077d

Browse files
techaddictpwendell
authored andcommitted
SPARK-1433: Upgrade Mesos dependency to 0.17.0
Mesos 0.13.0 was released 6 months ago. Upgrade Mesos dependency to 0.17.0 Author: Sandeep <[email protected]> Closes #355 from techaddict/mesos_update and squashes the following commits: f1abeee [Sandeep] SPARK-1433: Upgrade Mesos dependency to 0.17.0 Mesos 0.13.0 was released 6 months ago. Upgrade Mesos dependency to 0.17.0
1 parent fac6085 commit 12c077d

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala

+4-2
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,12 @@ private[spark] class CoarseMesosSchedulerBackend(
194194
.addResources(createResource("cpus", cpusToUse))
195195
.addResources(createResource("mem", sc.executorMemory))
196196
.build()
197-
d.launchTasks(offer.getId, Collections.singletonList(task), filters)
197+
d.launchTasks(Collections.singletonList(offer.getId),
198+
Collections.singletonList(task),
199+
filters)
198200
} else {
199201
// Filter it out
200-
d.launchTasks(offer.getId, Collections.emptyList[MesosTaskInfo](), filters)
202+
d.declineOffer(offer.getId, filters)
201203
}
202204
}
203205
}

core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ private[spark] class MesosSchedulerBackend(
223223
// Reply to the offers
224224
val filters = Filters.newBuilder().setRefuseSeconds(1).build() // TODO: lower timeout?
225225
for (i <- 0 until offers.size) {
226-
d.launchTasks(offers(i).getId, mesosTasks(i), filters)
226+
d.launchTasks(Collections.singletonList(offers(i).getId), mesosTasks(i), filters)
227227
}
228228
}
229229
} finally {

docs/_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ SPARK_VERSION: 1.0.0-SNAPSHOT
77
SPARK_VERSION_SHORT: 1.0.0
88
SCALA_BINARY_VERSION: "2.10"
99
SCALA_VERSION: "2.10.4"
10-
MESOS_VERSION: 0.13.0
10+
MESOS_VERSION: 0.17.0
1111
SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net
1212
SPARK_GITHUB_URL: https://github.com/apache/spark

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112

113113
<scala.version>2.10.4</scala.version>
114114
<scala.binary.version>2.10</scala.binary.version>
115-
<mesos.version>0.13.0</mesos.version>
115+
<mesos.version>0.17.0</mesos.version>
116116
<akka.group>org.spark-project.akka</akka.group>
117117
<akka.version>2.2.3-shaded-protobuf</akka.version>
118118
<slf4j.version>1.7.5</slf4j.version>
@@ -848,7 +848,7 @@
848848
</modules>
849849

850850
</profile>
851-
851+
852852
<!-- Build without Hadoop dependencies that are included in some runtime environments. -->
853853
<profile>
854854
<id>hadoop-provided</id>
@@ -893,6 +893,6 @@
893893
</dependency>
894894
</dependencies>
895895
</profile>
896-
896+
897897
</profiles>
898898
</project>

project/SparkBuild.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ object SparkBuild extends Build {
332332
"org.json4s" %% "json4s-jackson" % "3.2.6" excludeAll(excludeScalap),
333333
"it.unimi.dsi" % "fastutil" % "6.4.4",
334334
"colt" % "colt" % "1.2.0",
335-
"org.apache.mesos" % "mesos" % "0.13.0",
335+
"org.apache.mesos" % "mesos" % "0.17.0",
336336
"commons-net" % "commons-net" % "2.2",
337337
"net.java.dev.jets3t" % "jets3t" % "0.7.1" excludeAll(excludeCommonsLogging),
338338
"org.apache.derby" % "derby" % "10.4.2.0" % "test",

0 commit comments

Comments
 (0)