diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-06-01 11:45:47 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-06-01 11:45:47 -0700 |
commit | 9bb448a151a63426b61d1fa3c7c44aef667d1f40 (patch) | |
tree | 37669e10e233144054abe999f31cb58aadc41067 /core | |
parent | 850fe3274e5d73ec94ae590bc2c40d3348edbe2b (diff) | |
download | spark-9bb448a151a63426b61d1fa3c7c44aef667d1f40.tar.gz spark-9bb448a151a63426b61d1fa3c7c44aef667d1f40.tar.bz2 spark-9bb448a151a63426b61d1fa3c7c44aef667d1f40.zip |
Catch Throwable instead of Exception in LocalScheduler and Executor. Fixes #57.
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/scala/spark/Executor.scala | 4 | ||||
-rw-r--r-- | core/src/main/scala/spark/LocalScheduler.scala | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/src/main/scala/spark/Executor.scala b/core/src/main/scala/spark/Executor.scala index 7764acad1a..54e169a1a1 100644 --- a/core/src/main/scala/spark/Executor.scala +++ b/core/src/main/scala/spark/Executor.scala @@ -69,9 +69,9 @@ class Executor extends mesos.Executor with Logging { d.sendStatusUpdate(new TaskStatus( taskId, TaskState.TASK_FAILED, Utils.serialize(reason))) } - case e: Exception => { + case t: Throwable => { // TODO: Handle errors in tasks less dramatically - logError("Exception in task ID " + taskId, e) + logError("Exception in task ID " + taskId, t) System.exit(1) } } diff --git a/core/src/main/scala/spark/LocalScheduler.scala b/core/src/main/scala/spark/LocalScheduler.scala index 88da0c1af1..7d3ab661aa 100644 --- a/core/src/main/scala/spark/LocalScheduler.scala +++ b/core/src/main/scala/spark/LocalScheduler.scala @@ -36,9 +36,9 @@ private class LocalScheduler(threads: Int) extends DAGScheduler with Logging { logInfo("Finished task " + i) taskEnded(tasks(i), Success, result, accumUpdates) } catch { - case e: Exception => { + case t: Throwable => { // TODO: Do something nicer here - logError("Exception in task " + i, e) + logError("Exception in task " + i, t) System.exit(1) null } |