From fa55cea57be71b7842e573a76ae02cba0e9cc530 Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Fri, 6 May 2016 10:14:09 +0100 Subject: [PATCH] Fix incorrect resolution of merge conflict in commit bf3c0608f1779b4dd837b8289ec1d4516e145aea to branch-1.6, which back-ported SPARK-14915 --- .../org/apache/spark/scheduler/TaskSetManager.scala | 9 --------- 1 file changed, 9 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 3ca701d9e021f..77a8a195ffeb1 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala @@ -730,15 +730,6 @@ private[spark] class TaskSetManager( addPendingTask(index) } - if (successful(index)) { - logInfo( - s"Task ${info.id} in stage ${taskSet.id} (TID $tid) failed, " + - "but another instance of the task has already succeeded, " + - "so not re-queuing the task to be re-executed.") - } else { - addPendingTask(index) - } - if (!isZombie && state != TaskState.KILLED && reason.isInstanceOf[TaskFailedReason] && reason.asInstanceOf[TaskFailedReason].countTowardsTaskFailures) {