Skip to content

Remove blocks truly asynchroniously #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
EnricoMi wants to merge 1 commit into from
Closed

Remove blocks truly asynchroniously #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions core/src/main/scala/org/apache/spark/storage/BlockManagerMaster.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,40 +193,48 @@ class BlockManagerMaster(

/** Remove all blocks belonging to the given RDD. */
def removeRdd(rddId: Int, blocking: Boolean): Unit = {
val future = driverEndpoint.askSync[Future[Seq[Int]]](RemoveRdd(rddId))
val msg = RemoveRdd(rddId)
val future = if (blocking) {
driverEndpoint.askSync[Future[Seq[Int]]](msg, waitBlockRemovalTimeout)
} else {
driverEndpoint.ask[Future[Seq[Int]]](msg)
}

future.failed.foreach(e =>
logWarning(log"Failed to remove RDD ${MDC(RDD_ID, rddId)} - " +
log"${MDC(ERROR, e.getMessage)}", e)
)(ThreadUtils.sameThread)
if (blocking) {
waitBlockRemovalTimeout.awaitResult(future)
}
}

/** Remove all blocks belonging to the given shuffle. */
def removeShuffle(shuffleId: Int, blocking: Boolean): Unit = {
val future = driverEndpoint.askSync[Future[Seq[Boolean]]](RemoveShuffle(shuffleId))
val msg = RemoveShuffle(shuffleId)
val future = if (blocking) {
driverEndpoint.askSync[Future[Seq[Boolean]]](msg, waitBlockRemovalTimeout)
} else {
driverEndpoint.ask[Future[Seq[Boolean]]](msg)
}

future.failed.foreach(e =>
logWarning(log"Failed to remove shuffle ${MDC(SHUFFLE_ID, shuffleId)} - " +
log"${MDC(ERROR, e.getMessage)}", e)
)(ThreadUtils.sameThread)
if (blocking) {
waitBlockRemovalTimeout.awaitResult(future)
}
}

/** Remove all blocks belonging to the given broadcast. */
def removeBroadcast(broadcastId: Long, removeFromMaster: Boolean, blocking: Boolean): Unit = {
val future = driverEndpoint.askSync[Future[Seq[Int]]](
RemoveBroadcast(broadcastId, removeFromMaster))
val msg = RemoveBroadcast(broadcastId, removeFromMaster)
val future = if (blocking) {
driverEndpoint.askSync[Future[Seq[Int]]](msg, waitBlockRemovalTimeout)
} else {
driverEndpoint.ask[Future[Seq[Int]]](msg)
}

future.failed.foreach(e =>
logWarning(log"Failed to remove broadcast ${MDC(BROADCAST_ID, broadcastId)}" +
log" with removeFromMaster = ${MDC(REMOVE_FROM_MASTER, removeFromMaster)} - " +
log"${MDC(ERROR, e.getMessage)}", e)
)(ThreadUtils.sameThread)
if (blocking) {
waitBlockRemovalTimeout.awaitResult(future)
}
}

/**
Expand Down
Loading