Skip to content

Commit ff620ba

Browse files
committed
Don't join the block migration thread, we'll block on that
1 parent 4071ae2 commit ff620ba

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

core/src/main/scala/org/apache/spark/storage/BlockManager.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,8 +2050,9 @@ private[spark] class BlockManager(
20502050
logInfo(s"Waiting for ${sleepInterval} before refreshing migrations.")
20512051
Thread.sleep(sleepInterval)
20522052
} catch {
2053-
case _: InterruptedException =>
2053+
case e: InterruptedException =>
20542054
logInfo("Interrupted during migration, will not refresh migrations.")
2055+
stopped = true
20552056
// no-op
20562057
case NonFatal(e) =>
20572058
logError("Error occurred while trying to " +
@@ -2073,7 +2074,6 @@ private[spark] class BlockManager(
20732074
stopped = true
20742075
logInfo("Stopping block replication thread")
20752076
blockMigrationThread.interrupt()
2076-
blockMigrationThread.join()
20772077
}
20782078
}
20792079
}

0 commit comments

Comments
 (0)