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/02/06 08:38:21 UTC
git commit: Merge pull request #545 from kayousterhout/fix_progress.
Closes #545.
Updated Branches:
refs/heads/master 38020961d -> 79c95527a
Merge pull request #545 from kayousterhout/fix_progress. Closes #545.
Fix off-by-one error with task progress info log.
Author: Kay Ousterhout <ka...@gmail.com>
== Merge branch commits ==
commit 29798fc685c4e7e3eb3bf91c75df7fa8ec94a235
Author: Kay Ousterhout <ka...@gmail.com>
Date: Wed Feb 5 13:40:01 2014 -0800
Fix off-by-one error with task progress info log.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/79c95527
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/79c95527
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/79c95527
Branch: refs/heads/master
Commit: 79c95527a77af32bd83a968c1a56feb22e441b7d
Parents: 3802096
Author: Kay Ousterhout <ka...@gmail.com>
Authored: Wed Feb 5 23:38:12 2014 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Wed Feb 5 23:38:12 2014 -0800
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/79c95527/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 e914708..777f31d 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
@@ -437,13 +437,13 @@ private[spark] class TaskSetManager(
info.markSuccessful()
removeRunningTask(tid)
if (!successful(index)) {
+ tasksSuccessful += 1
logInfo("Finished TID %s in %d ms on %s (progress: %d/%d)".format(
tid, info.duration, info.host, tasksSuccessful, numTasks))
sched.dagScheduler.taskEnded(
tasks(index), Success, result.value, result.accumUpdates, info, result.metrics)
// Mark successful and stop if all the tasks have succeeded.
- tasksSuccessful += 1
successful(index) = true
if (tasksSuccessful == numTasks) {
sched.taskSetFinished(this)