diff options
| author | Matei Zaharia <matei@databricks.com> | 2014-01-02 15:57:28 -0500 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-01-02 15:57:28 -0500 |
| commit | 7bafb68d77fa156c0dd7541aeef14626f867726b (patch) | |
| tree | 8411a752550124587015acbdb0fa02cd2b7b4766 /core | |
| parent | ca67909cd4b4accea64498b3bc1421c6d75e33a6 (diff) | |
| parent | 5e67cdc801baf8f08b8229472cb16a00e52ddd00 (diff) | |
| download | spark-7bafb68d77fa156c0dd7541aeef14626f867726b.tar.gz spark-7bafb68d77fa156c0dd7541aeef14626f867726b.tar.bz2 spark-7bafb68d77fa156c0dd7541aeef14626f867726b.zip | |
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-spark
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala b/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala index d94b706854..c4ac8337c5 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala @@ -328,7 +328,7 @@ private[spark] class TaskSchedulerImpl( // Have each task set throw a SparkException with the error for ((taskSetId, manager) <- activeTaskSets) { try { - manager.error(message) + manager.abort(message) } catch { case e: Exception => logError("Exception in error callback", e) } diff --git a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala index 67ad99a4d7..6dd1469d8f 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala @@ -548,11 +548,6 @@ private[spark] class TaskSetManager( } } - def error(message: String) { - // Save the error message - abort("Error: " + message) - } - def abort(message: String) { // TODO: Kill running tasks if we were not terminated due to a Mesos error sched.dagScheduler.taskSetFailed(taskSet, message) |