Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Various fixes

  • Loading branch information...
commit 4096c2287ec8e69b0c879ea0c512b9f7152e15ab 1 parent ef706ae
@mateiz mateiz authored
View
BIN  core/lib/mesos.jar
Binary file not shown
View
BIN  core/lib/protobuf-2.3.0.jar
Binary file not shown
View
8 core/src/main/scala/spark/MesosScheduler.scala
@@ -79,7 +79,13 @@ extends MScheduler with DAGScheduler with Logging
override def run {
val sched = MesosScheduler.this
sched.driver = new MesosSchedulerDriver(sched, master)
- sched.driver.run()
+ try {
+ val ret = sched.driver.run()
+ logInfo("driver.run() returned with code " + ret)
+ } catch {
+ case e: Exception =>
+ logError("driver.run() failed", e)
+ }
}
}.start
}
View
4 core/src/main/scala/spark/SimpleJob.scala
@@ -204,7 +204,7 @@ extends Job(jobId) with Logging
val index = tidToIndex(tid.getValue)
if (!finished(index)) {
tasksFinished += 1
- logInfo("Finished TID %d (progress: %d/%d)".format(
+ logInfo("Finished TID %s (progress: %d/%d)".format(
tid, tasksFinished, numTasks))
// Deserialize task result
val result = Utils.deserialize[TaskResult[_]](status.getData.toByteArray)
@@ -223,7 +223,7 @@ extends Job(jobId) with Logging
val tid = status.getTaskId
val index = tidToIndex(tid.getValue)
if (!finished(index)) {
- logInfo("Lost TID %d (task %d:%d)".format(tid, jobId, index))
+ logInfo("Lost TID %s (task %d:%d)".format(tid, jobId, index))
launched(index) = false
tasksLaunched -= 1
// Check if the problem is a map output fetch failure. In that case, this
View
1  project/build/SparkProject.scala
@@ -41,6 +41,7 @@ class SparkProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje
val asm = "asm" % "asm-all" % "3.3.1"
val scalaTest = "org.scalatest" % "scalatest" % "1.3" % "test"
val scalaCheck = "org.scala-tools.testing" %% "scalacheck" % "1.7" % "test"
+ val protobuf = "com.google.protobuf" % "protobuf-java" % "2.3.0"
}
class ReplProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject with DepJar with XmlTestReport
Please sign in to comment.
Something went wrong with that request. Please try again.