Skip to content

Commit 3152e9b

Browse files
committed
fix TSM rest
1 parent 47da0d7 commit 3152e9b

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -394,15 +394,10 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, val rpcEnv: Rp
394394
addressToExecutorId -= executorInfo.executorAddress
395395
executorDataMap -= executorId
396396
executorsPendingLossReason -= executorId
397+
val decommissioned = executorsPendingDecommission.remove(executorId)
397398
executorsPendingToRemove
398-
.remove(executorId).map(_ => ExecutorKilled)
399-
.getOrElse {
400-
if (executorsPendingDecommission.remove(executorId)) {
401-
ExecutorDecommission()
402-
} else {
403-
reason
404-
}
405-
}
399+
.remove(executorId).filter(killedByDriver => killedByDriver).map(_ => ExecutorKilled)
400+
.getOrElse(if (decommissioned) ExecutorDecommission() else reason)
406401
}
407402
totalCoreCount.addAndGet(-executorInfo.totalCores)
408403
totalRegisteredExecutors.addAndGet(-1)

0 commit comments

Comments
 (0)