You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/06/04 07:37:23 UTC
git commit: SPARK-1806 (addendum) Use non-deprecated methods in Mesos
0.18
Repository: spark
Updated Branches:
refs/heads/master ab7c62d57 -> 4ca062566
SPARK-1806 (addendum) Use non-deprecated methods in Mesos 0.18
The update to Mesos 0.18 caused some deprecation warnings in the build. The change to the non-deprecated version is straightforward as it emulates what the Mesos driver does with the deprecated method anyway (https://github.com/apache/mesos/blob/c5aa1dd22155d79c5a7c33076319299a40fd63b3/src/sched/sched.cpp#L1354)
Author: Sean Owen <so...@cloudera.com>
Closes #920 from srowen/SPARK-1806 and squashes the following commits:
8d76b6a [Sean Owen] Use non-deprecated methods in Mesos 0.18
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4ca06256
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4ca06256
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4ca06256
Branch: refs/heads/master
Commit: 4ca06256690c5e03058dd179c2fc6437a917cfee
Parents: ab7c62d
Author: Sean Owen <so...@cloudera.com>
Authored: Tue Jun 3 22:37:20 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Tue Jun 3 22:37:20 2014 -0700
----------------------------------------------------------------------
.../scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala | 6 ++++--
.../spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/4ca06256/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
index cbe9bb0..9f45400 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
@@ -207,10 +207,12 @@ private[spark] class CoarseMesosSchedulerBackend(
.addResources(createResource("cpus", cpusToUse))
.addResources(createResource("mem", sc.executorMemory))
.build()
- d.launchTasks(offer.getId, Collections.singletonList(task), filters)
+ d.launchTasks(
+ Collections.singleton(offer.getId), Collections.singletonList(task), filters)
} else {
// Filter it out
- d.launchTasks(offer.getId, Collections.emptyList[MesosTaskInfo](), filters)
+ d.launchTasks(
+ Collections.singleton(offer.getId), Collections.emptyList[MesosTaskInfo](), filters)
}
}
}
http://git-wip-us.apache.org/repos/asf/spark/blob/4ca06256/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala
index f08b19e..a089a02 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala
@@ -223,7 +223,7 @@ private[spark] class MesosSchedulerBackend(
// Reply to the offers
val filters = Filters.newBuilder().setRefuseSeconds(1).build() // TODO: lower timeout?
for (i <- 0 until offers.size) {
- d.launchTasks(offers(i).getId, mesosTasks(i), filters)
+ d.launchTasks(Collections.singleton(offers(i).getId), mesosTasks(i), filters)
}
}
} finally {