aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/scala/org/apache
diff options
context:
space:
mode:
authorKay Ousterhout <kayousterhout@gmail.com>2013-12-22 07:27:28 -0800
committerKay Ousterhout <kayousterhout@gmail.com>2013-12-22 07:34:44 -0800
commitb7bfae1afecad0ae79d5d040d2e02e390c272efb (patch)
tree2bae5725dc7ca50b3a7fca3a9d1ade6ccc5f5070 /core/src/main/scala/org/apache
parentb8ae096a40eb0f83aac889deb061a9484effd9aa (diff)
downloadspark-b7bfae1afecad0ae79d5d040d2e02e390c272efb.tar.gz
spark-b7bfae1afecad0ae79d5d040d2e02e390c272efb.tar.bz2
spark-b7bfae1afecad0ae79d5d040d2e02e390c272efb.zip
Correctly merged in maxTaskFailures fix
Diffstat (limited to 'core/src/main/scala/org/apache')
-rw-r--r--core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala2
1 files changed, 1 insertions, 1 deletions
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 0ac982909c..aa3fb0b35a 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
@@ -540,7 +540,7 @@ private[spark] class TaskSetManager(
if (numFailures(index) >= maxTaskFailures) {
logError("Task %s:%d failed %d times; aborting job".format(
taskSet.id, index, maxTaskFailures))
- abort("Task %s:%d failed more than %d times (most recent failure: %s)".format(
+ abort("Task %s:%d failed %d times (most recent failure: %s)".format(
taskSet.id, index, maxTaskFailures, failureReason))
}
}