diff options
author | root <root@ip-10-202-143-64.ec2.internal> | 2010-08-13 07:39:36 +0000 |
---|---|---|
committer | root <root@ip-10-202-143-64.ec2.internal> | 2010-08-13 07:39:36 +0000 |
commit | a9481c3514b33389de7a7db5e5c0ac8291c11f1c (patch) | |
tree | 31340add56bd9c7437f18ef41d07ec856ce88dfa /src | |
parent | 4488b3bc8a4483eeeb703d96842ea3e9695300c3 (diff) | |
download | spark-a9481c3514b33389de7a7db5e5c0ac8291c11f1c.tar.gz spark-a9481c3514b33389de7a7db5e5c0ac8291c11f1c.tar.bz2 spark-a9481c3514b33389de7a7db5e5c0ac8291c11f1c.zip |
Update to work with latest Mesos API changes
Diffstat (limited to 'src')
-rw-r--r-- | src/scala/spark/MesosScheduler.scala | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/scala/spark/MesosScheduler.scala b/src/scala/spark/MesosScheduler.scala index 84b9d9af68..74c1d8dfb5 100644 --- a/src/scala/spark/MesosScheduler.scala +++ b/src/scala/spark/MesosScheduler.scala @@ -100,9 +100,9 @@ extends NScheduler with spark.Scheduler } override def resourceOffer( - d: SchedulerDriver, oid: String, offers: SlaveOfferVector) { + d: SchedulerDriver, oid: String, offers: java.util.List[SlaveOffer]) { synchronized { - val tasks = new TaskDescriptionVector + val tasks = new java.util.ArrayList[TaskDescription] if (activeOp != null) { try { for (i <- 0 until offers.size.toInt) { @@ -115,8 +115,8 @@ extends NScheduler with spark.Scheduler case e: Exception => e.printStackTrace } } - val params = new StringMap - params.set("timeout", "1") + val params = new java.util.HashMap[String, String] + params.put("timeout", "1") d.replyToOffer(oid, tasks, params) // TODO: use smaller timeout } } @@ -212,9 +212,9 @@ extends ParallelOperation checkPrefVals = Array(true, false) // Allow non-preferred tasks // TODO: Make desiredCpus and desiredMem configurable val desiredCpus = 1 - val desiredMem = 750L * 1024L * 1024L + val desiredMem = 750 if (offer.getParams.get("cpus").toInt < desiredCpus || - offer.getParams.get("mem").toLong < desiredMem) + offer.getParams.get("mem").toInt < desiredMem) return None for (checkPref <- checkPrefVals; i <- 0 until numTasks) { if (!launched(i) && (!checkPref || @@ -231,9 +231,9 @@ extends ParallelOperation tasksLaunched += 1 if (checkPref) lastPreferredLaunchTime = time - val params = new StringMap - params.set("cpus", "" + desiredCpus) - params.set("mem", "" + desiredMem) + val params = new java.util.HashMap[String, String] + params.put("cpus", "" + desiredCpus) + params.put("mem", "" + desiredMem) val serializedTask = Utils.serialize(tasks(i)) return Some(new TaskDescription(taskId, offer.getSlaveId, "task_" + taskId, params, serializedTask)) |