Skip to content

[SPARK-4064]NioBlockTransferService.fetchBlocks may cause spark to hang. #2929

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
witgo wants to merge 3 commits into from
Closed

[SPARK-4064]NioBlockTransferService.fetchBlocks may cause spark to hang. #2929

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b07e49
If we create a lot of big broadcast variables, Spark may hang
witgo Oct 24, 2014
3425225
review commits
witgo Oct 25, 2014
20110f2
Modify the exception msg
witgo Oct 27, 2014
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
25 changes: 15 additions & 10 deletions core/src/main/scala/org/apache/spark/network/nio/NioBlockTransferService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,21 @@ final class NioBlockTransferService(conf: SparkConf, securityManager: SecurityMa
future.onSuccess { case message =>
val bufferMessage = message.asInstanceOf[BufferMessage]
val blockMessageArray = BlockMessageArray.fromBufferMessage(bufferMessage)

for (blockMessage <- blockMessageArray) {
if (blockMessage.getType != BlockMessage.TYPE_GOT_BLOCK) {
listener.onBlockFetchFailure(
new SparkException(s"Unexpected message ${blockMessage.getType} received from $cmId"))
} else {
val blockId = blockMessage.getId
val networkSize = blockMessage.getData.limit()
listener.onBlockFetchSuccess(
blockId.toString, new NioByteBufferManagedBuffer(blockMessage.getData))
// SPARK-4064: In some cases(eg. Remote block was removed) blockMessageArray may be empty.
if (blockMessageArray.isEmpty) {
listener.onBlockFetchFailure(
new SparkException(s"Received empty message from $cmId"))
} else {
for (blockMessage <- blockMessageArray) {
val msgType = blockMessage.getType
if (msgType != BlockMessage.TYPE_GOT_BLOCK) {
listener.onBlockFetchFailure(
new SparkException(s"Unexpected message ${msgType} received from $cmId"))
} else {
val blockId = blockMessage.getId
listener.onBlockFetchSuccess(
blockId.toString, new NioByteBufferManagedBuffer(blockMessage.getData))
}
}
}
}(cm.futureExecContext)
Expand Down