dongjoon-hyun commented on code in PR #41082:
URL: https://github.com/apache/spark/pull/41082#discussion_r1192758370
##########
core/src/main/scala/org/apache/spark/scheduler/dynalloc/ExecutorMonitor.scala:
##########
@@ -563,17 +563,10 @@ private[spark] class ExecutorMonitor(
def updateTimeout(): Unit = {
val oldDeadline = timeoutAt
val newDeadline = if (idleStart >= 0) {
- val timeout = if (cachedBlocks.nonEmpty || (shuffleIds != null &&
shuffleIds.nonEmpty)) {
- val _cacheTimeout = if (cachedBlocks.nonEmpty) storageTimeoutNs else
Long.MaxValue
- val _shuffleTimeout = if (shuffleIds != null && shuffleIds.nonEmpty)
{
- shuffleTimeoutNs
- } else {
- Long.MaxValue
- }
- math.min(_cacheTimeout, _shuffleTimeout)
- } else {
- idleTimeoutNs
- }
+ val _cacheTimeout = if (cachedBlocks.nonEmpty) storageTimeoutNs else 0
+ val _shuffleTimeout = if (shuffleIds.nonEmpty) shuffleTimeoutNs else 0
Review Comment:
BTW, could you add a test case which `shuffleTrackingEnabled` is false? I
guess your new code might hit NPE in that test case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
