Skip to content

[SPARK-17485] Prevent failed remote reads of cached blocks from failing entire job (branch-1.6 backport) #15186

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
wants to merge 1 commit into from
Closed

[SPARK-17485] Prevent failed remote reads of cached blocks from failing entire job (branch-1.6 backport) #15186

Show file tree
Hide file tree
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
24 changes: 0 additions & 24 deletions core/src/main/scala/org/apache/spark/storage/BlockFetchException.scala
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/storage/BlockManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,9 @@ private[spark] class BlockManager(
numFetchFailures += 1
if (numFetchFailures == locations.size) {
// An exception is thrown while fetching this block from all locations
throw new BlockFetchException(s"Failed to fetch block from" +
logWarning(s"Failed to fetch block from" +
s" ${locations.size} locations. Most recent failure cause:", e)
return None
} else {
// This location failed, so we retry fetch from a different one by returning null here
logWarning(s"Failed to fetch remote block $blockId " +
Expand Down
7 changes: 3 additions & 4 deletions core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,10 +509,9 @@ class BlockManagerSuite extends SparkFunSuite with Matchers with BeforeAndAfterE
assert(list1Get.isDefined, "list1Get expected to be fetched")
store3.stop()
store3 = null
// exception throw because there is no locations
intercept[BlockFetchException] {
list1Get = store.getRemoteBytes("list1")
}
// Fetch should fail because there are no locations, but no exception should be thrown
list1Get = store.getRemoteBytes("list1")
assert(list1Get.isEmpty, "list1Get expected to fail")
} finally {
origTimeoutOpt match {
case Some(t) => conf.set("spark.network.timeout", t)
Expand Down