Skip to content

[SPARK-24307][CORE] Add conf to revert to old code. #21867

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

[SPARK-24307][CORE] Add conf to revert to old code. #21867

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc2ea46
[SPARK-24307][CORE] Add conf to revert to old code.
squito Jul 24, 2018
1275c01
review comments
squito Jul 25, 2018
a5b00b8
fix typo
squito Jul 25, 2018
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
11 changes: 10 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 @@ -132,6 +132,8 @@ private[spark] class BlockManager(
conf.getBoolean("spark.shuffle.service.enabled", false)
private val chunkSize =
conf.getSizeAsBytes("spark.storage.memoryMapLimitForTests", Int.MaxValue.toString).toInt
private val remoteReadNioBufferConversion =
conf.getBoolean("spark.network.remoteReadNioBufferConversion", false)

val diskBlockManager = {
// Only perform cleanup if an external service is not serving our shuffle files.
Expand Down Expand Up @@ -731,7 +733,14 @@ private[spark] class BlockManager(
}

if (data != null) {
return Some(ChunkedByteBuffer.fromManagedBuffer(data, chunkSize))
// SPARK-24307 undocumented "escape-hatch" in case there are any issues in converting to
// ChunkedByteBuffer, to go back to old code-path. Can be removed post Spark 2.4 if
// new path is stable.
if (remoteReadNioBufferConversion) {
return Some(new ChunkedByteBuffer(data.nioByteBuffer()))
} else {
return Some(ChunkedByteBuffer.fromManagedBuffer(data, chunkSize))
}
}
logDebug(s"The value of block $blockId is null")
}
Expand Down