Github user andrewor14 commented on a diff in the pull request:
https://github.com/apache/spark/pull/6508#discussion_r31378577
--- Diff:
core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala ---
@@ -443,9 +466,27 @@ private[spark] class ExecutorAllocationManager(
private def onExecutorIdle(executorId: String): Unit = synchronized {
if (executorIds.contains(executorId)) {
if (!removeTimes.contains(executorId) &&
!executorsPendingToRemove.contains(executorId)) {
+
+ val hasCachedBlocks =
+ executorsWithCachedBlocks.contains(executorId) ||
+
executorEndpoints.get(executorId).exists(_.askWithRetry[Boolean](HasCachedBlocks))
+
+ if (hasCachedBlocks) executorsWithCachedBlocks += executorId
+
+ val now = clock.getTimeMillis()
+ val timeout = {
+ if (hasCachedBlocks) {
+ val newExpiry = now + cachedExecutorTimeoutS * 1000
+ if (newExpiry < 0) Long.MaxValue // Overflow
+ else newExpiry
+ } else {
+ now + executorIdleTimeoutS * 1000
+ }
+ }
+
+ removeTimes(executorId) = timeout
logDebug(s"Starting idle timer for $executorId because there are
no more tasks " +
- s"scheduled to run on the executor (to expire in
$executorIdleTimeoutS seconds)")
- removeTimes(executorId) = clock.getTimeMillis +
executorIdleTimeoutS * 1000
+ s"scheduled to run on the executor")
--- End diff --
can you restore the rest of this log statement?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
