aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Ousterhout <kayousterhout@gmail.com>2013-12-30 12:23:18 -0800
committerKay Ousterhout <kayousterhout@gmail.com>2014-01-02 11:13:58 -0800
commit5a3c00c9581f81522a32c0b5d21ba81498c2d9c3 (patch)
tree8b9bb1c7287ef498c2c5d61e8943a322c005f0ee
parent3713f8129a618a633a7aca8c944960c3e7ac9d3b (diff)
downloadspark-5a3c00c9581f81522a32c0b5d21ba81498c2d9c3.tar.gz
spark-5a3c00c9581f81522a32c0b5d21ba81498c2d9c3.tar.bz2
spark-5a3c00c9581f81522a32c0b5d21ba81498c2d9c3.zip
Removed redundant TaskSetManager.error() function.
This function was leftover from a while ago, and now just passes all calls through to the abort() function, so this commit deletes it.
-rw-r--r--core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala2
-rw-r--r--core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala5
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)