add another related fix patch

suyanNone · suyanNone · commit 3bf1eaaddc36 · 2016-05-10T21:12:14.000+08:00
diff --git a/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala b/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala
@@ -364,12 +364,14 @@ private[spark] class TaskSchedulerImpl(
                 }
               }
             }
-            if (state == TaskState.FINISHED) {
-              taskSet.removeRunningTask(tid)
-              taskResultGetter.enqueueSuccessfulTask(taskSet, tid, serializedData)
-            } else if (Set(TaskState.FAILED, TaskState.KILLED, TaskState.LOST).contains(state)) {
-              taskSet.removeRunningTask(tid)
-              taskResultGetter.enqueueFailedTask(taskSet, tid, state, serializedData)
+            if (taskSet.runningTasksSet.contains(tid)) {
+              if (state == TaskState.FINISHED) {
+                taskSet.removeRunningTask(tid)
+                taskResultGetter.enqueueSuccessfulTask(taskSet, tid, serializedData)
+              } else if (Set(TaskState.FAILED, TaskState.KILLED, TaskState.LOST).contains(state)) {
+                taskSet.removeRunningTask(tid)
+                taskResultGetter.enqueueFailedTask(taskSet, tid, state, serializedData)
+              }
             }
           case None =>
             logError(

Original file line number	Diff line number	Diff line change
`@@ -364,12 +364,14 @@ private[spark] class TaskSchedulerImpl(`
`364`	`364`	`}`
`365`	`365`	`}`
`366`	`366`	`}`
`367`		`- if (state == TaskState.FINISHED) {`
`368`		`- taskSet.removeRunningTask(tid)`
`369`		`- taskResultGetter.enqueueSuccessfulTask(taskSet, tid, serializedData)`
`370`		`- } else if (Set(TaskState.FAILED, TaskState.KILLED, TaskState.LOST).contains(state)) {`
`371`		`- taskSet.removeRunningTask(tid)`
`372`		`- taskResultGetter.enqueueFailedTask(taskSet, tid, state, serializedData)`
	`367`	`+ if (taskSet.runningTasksSet.contains(tid)) {`
	`368`	`+ if (state == TaskState.FINISHED) {`
	`369`	`+ taskSet.removeRunningTask(tid)`
	`370`	`+ taskResultGetter.enqueueSuccessfulTask(taskSet, tid, serializedData)`
	`371`	`+ } else if (Set(TaskState.FAILED, TaskState.KILLED, TaskState.LOST).contains(state)) {`
	`372`	`+ taskSet.removeRunningTask(tid)`
	`373`	`+ taskResultGetter.enqueueFailedTask(taskSet, tid, state, serializedData)`
	`374`	`+ }`
`373`	`375`	`}`
`374`	`376`	`case None =>`
`375`	`377`	`logError(`