Updated Branches: refs/heads/master a51f3404a -> 883e034ae
Fix for spark.task.maxFailures not enforced correctly. Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/14a1df65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/14a1df65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/14a1df65 Branch: refs/heads/master Commit: 14a1df65729a3c7e5fd54f79424626a540aef5d4 Parents: d992ec6 Author: Grega Kespret <[email protected]> Authored: Mon Dec 9 10:39:02 2013 +0100 Committer: Grega Kespret <[email protected]> Committed: Mon Dec 9 10:39:02 2013 +0100 ---------------------------------------------------------------------- .../apache/spark/scheduler/cluster/ClusterTaskSetManager.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/14a1df65/core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala index 9496179..bf494aa 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala @@ -529,10 +529,10 @@ private[spark] class ClusterTaskSetManager( addPendingTask(index) if (state != TaskState.KILLED) { numFailures(index) += 1 - if (numFailures(index) > MAX_TASK_FAILURES) { - logError("Task %s:%d failed more than %d times; aborting job".format( + if (numFailures(index) >= MAX_TASK_FAILURES) { + logError("Task %s:%d failed %d times; aborting job".format( taskSet.id, index, MAX_TASK_FAILURES)) - abort("Task %s:%d failed more than %d times".format(taskSet.id, index, MAX_TASK_FAILURES)) + abort("Task %s:%d failed %d times".format(taskSet.id, index, MAX_TASK_FAILURES)) } } } else {
