diff options
| -rw-r--r-- | src/examples/LocalFileLR.scala | 2 | ||||
| -rw-r--r-- | src/scala/spark/NexusScheduler.scala | 6 | ||||
| -rw-r--r-- | third_party/nexus.jar | bin | 39840 -> 42647 bytes |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/examples/LocalFileLR.scala b/src/examples/LocalFileLR.scala index 988442755a..3d3bb60677 100644 --- a/src/examples/LocalFileLR.scala +++ b/src/examples/LocalFileLR.scala @@ -13,7 +13,7 @@ object LocalFileLR { } def main(args: Array[String]) { - val lines = scala.io.Source.fromPath(args(0)).getLines() + val lines = scala.io.Source.fromFile(args(0)).getLines() val points = lines.map(parsePoint _) val ITERATIONS = args(1).toInt diff --git a/src/scala/spark/NexusScheduler.scala b/src/scala/spark/NexusScheduler.scala index a5343039ef..752df2b15c 100644 --- a/src/scala/spark/NexusScheduler.scala +++ b/src/scala/spark/NexusScheduler.scala @@ -84,7 +84,7 @@ extends NScheduler with spark.Scheduler } } - override def registered(d: SchedulerDriver, frameworkId: Int) { + override def registered(d: SchedulerDriver, frameworkId: String) { println("Registered as framework ID " + frameworkId) registeredLock.synchronized { isRegistered = true @@ -100,7 +100,7 @@ extends NScheduler with spark.Scheduler } override def resourceOffer( - d: SchedulerDriver, oid: Long, offers: SlaveOfferVector) { + d: SchedulerDriver, oid: String, offers: SlaveOfferVector) { synchronized { val tasks = new TaskDescriptionVector if (activeOp != null) { @@ -223,7 +223,7 @@ extends ParallelOperation { val taskId = sched.newTaskId() tidToIndex(taskId) = i - printf("Starting task %d as TID %d on slave %d: %s (%s)\n", + printf("Starting task %d as TID %s on slave %s: %s (%s)\n", i, taskId, offer.getSlaveId, offer.getHost, if(checkPref) "preferred" else "non-preferred") tasks(i).markStarted(offer) diff --git a/third_party/nexus.jar b/third_party/nexus.jar Binary files differindex 300e2d10a5..735a09c7c5 100644 --- a/third_party/nexus.jar +++ b/third_party/nexus.jar |