You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/01/02 21:56:32 UTC
[1/2] git commit: Removed redundant TaskSetManager.error() function.
Updated Branches:
refs/heads/master 3713f8129 -> 5e67cdc80
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/5a3c00c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/5a3c00c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/5a3c00c9
Branch: refs/heads/master
Commit: 5a3c00c9581f81522a32c0b5d21ba81498c2d9c3
Parents: 3713f81
Author: Kay Ousterhout <ka...@gmail.com>
Authored: Mon Dec 30 12:23:18 2013 -0800
Committer: Kay Ousterhout <ka...@gmail.com>
Committed: Thu Jan 2 11:13:58 2014 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala | 2 +-
.../main/scala/org/apache/spark/scheduler/TaskSetManager.scala | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/5a3c00c9/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala
----------------------------------------------------------------------
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 d94b706..c4ac833 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)
}
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/5a3c00c9/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
----------------------------------------------------------------------
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 67ad99a..6dd1469 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)
[2/2] git commit: Merge pull request #319 from
kayousterhout/remove_error_method
Posted by rx...@apache.org.
Merge pull request #319 from kayousterhout/remove_error_method
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/5e67cdc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/5e67cdc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/5e67cdc8
Branch: refs/heads/master
Commit: 5e67cdc801baf8f08b8229472cb16a00e52ddd00
Parents: 3713f81 5a3c00c
Author: Reynold Xin <rx...@apache.org>
Authored: Thu Jan 2 12:56:28 2014 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Thu Jan 2 12:56:28 2014 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala | 2 +-
.../main/scala/org/apache/spark/scheduler/TaskSetManager.scala | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------