Skip to content

[SPARK-22618][CORE] Catch exception in removeRDD to stop jobs from dying #19836

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
brad-kaiser wants to merge 2 commits into from
Closed

[SPARK-22618][CORE] Catch exception in removeRDD to stop jobs from dying #19836

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbd2497
[SPARK-22618][CORE] Catch exception in removeRDD to stop jobs from dying
Nov 27, 2017
e2ad8c3
[SPARK-22618][CORE] inlined error handling function
Dec 6, 2017
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
18 changes: 13 additions & 5 deletions core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.spark.storage

import java.io.IOException
import java.util.{HashMap => JHashMap}

import scala.collection.JavaConverters._
Expand Down Expand Up @@ -159,11 +160,18 @@ class BlockManagerMasterEndpoint(
// Ask the slaves to remove the RDD, and put the result in a sequence of Futures.
// The dispatcher is used as an implicit argument into the Future sequence construction.
val removeMsg = RemoveRdd(rddId)
Future.sequence(
blockManagerInfo.values.map { bm =>
bm.slaveEndpoint.ask[Int](removeMsg)
}.toSeq
)

val handleRemoveRddException: PartialFunction[Throwable, Int] = {
case e: IOException =>
logWarning(s"Error trying to remove RDD $rddId", e)
0 // zero blocks were removed
}

val futures = blockManagerInfo.values.map { bm =>
bm.slaveEndpoint.ask[Int](removeMsg).recover(handleRemoveRddException)

@cloud-fan cloud-fan Dec 6, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

personally I think

bm.slaveEndpoint.ask[Int](removeMsg).recover {
  case e: IOException =>
    logWarning(s"Error trying to remove RDD $rddId", e)
    0 // zero blocks were removed
}

is more readable

@brad-kaiser brad-kaiser Dec 6, 2017

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I updated this. Thanks.

}.toSeq

Future.sequence(futures)
}

private def removeShuffle(shuffleId: Int): Future[Seq[Boolean]] = {
Expand Down