Updated Branches: refs/heads/branch-0.8 504fe7465 -> ba0e8584a
Merge pull request #126 from kayousterhout/local_fix Fixed incorrect log message in local scheduler This change is especially relevant at the moment, because some users are seeing this failure, and the log message is misleading/incorrect (because for the tests, the max failures is set to 0, not 4) (cherry picked from commit dc9ce16f6b695295c24062a76fd10f574d278cac) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/ba0e8584 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/ba0e8584 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/ba0e8584 Branch: refs/heads/branch-0.8 Commit: ba0e8584a2d6e2d12fe63ec3aefdc2ba8b13818a Parents: 504fe74 Author: Matei Zaharia <[email protected]> Authored: Wed Oct 30 17:01:56 2013 -0700 Committer: Reynold Xin <[email protected]> Committed: Sun Nov 3 23:43:48 2013 -0800 ---------------------------------------------------------------------- .../org/apache/spark/scheduler/local/LocalTaskSetManager.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/ba0e8584/core/src/main/scala/org/apache/spark/scheduler/local/LocalTaskSetManager.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/scheduler/local/LocalTaskSetManager.scala b/core/src/main/scala/org/apache/spark/scheduler/local/LocalTaskSetManager.scala index 55f8313..53bf782 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/local/LocalTaskSetManager.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/local/LocalTaskSetManager.scala @@ -175,7 +175,7 @@ private[spark] class LocalTaskSetManager(sched: LocalScheduler, val taskSet: Tas reason.className, reason.description, locs.mkString("\n"))) if (numFailures(index) > MAX_TASK_FAILURES) { val errorMessage = "Task %s:%d failed more than %d times; aborting job %s".format( - taskSet.id, index, 4, reason.description) + taskSet.id, index, MAX_TASK_FAILURES, reason.description) decreaseRunningTasks(runningTasks) sched.dagScheduler.taskSetFailed(taskSet, errorMessage) // need to delete failed Taskset from schedule queue
