[SPARK-16522][MESOS] Spark application throws exception on exit.

sun-rui · sun-rui · commit 6fe96e5879fd · 2016-07-13T15:43:38.000+08:00
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosCoarseGrainedSchedulerBackend.scala
@@ -552,7 +552,9 @@ private[spark] class MesosCoarseGrainedSchedulerBackend(
       taskId: String,
       reason: String): Unit = {
     stateLock.synchronized {
-      removeExecutor(taskId, SlaveLost(reason))
+      if (!stopCalled) {
+        removeExecutor(taskId, SlaveLost(reason))
+      }
       slaves(slaveId).taskIDs.remove(taskId)
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,9 @@ private[spark] class MesosCoarseGrainedSchedulerBackend(`
`552`	`552`	`taskId: String,`
`553`	`553`	`reason: String): Unit = {`
`554`	`554`	`stateLock.synchronized {`
`555`		`- removeExecutor(taskId, SlaveLost(reason))`
	`555`	`+ if (!stopCalled) {`
	`556`	`+ removeExecutor(taskId, SlaveLost(reason))`
	`557`	`+ }`
`556`	`558`	`slaves(slaveId).taskIDs.remove(taskId)`
`557`	`559`	`}`
`558`	`560`	`}`