Github user nongli commented on a diff in the pull request:
https://github.com/apache/spark/pull/11534#discussion_r55278560
--- Diff: core/src/main/scala/org/apache/spark/storage/BlockManager.scala
---
@@ -422,108 +462,52 @@ private[spark] class BlockManager(
Option(
shuffleBlockResolver.getBlockData(blockId.asInstanceOf[ShuffleBlockId]).nioByteBuffer())
} else {
- doGetLocal(blockId, asBlockResult =
false).asInstanceOf[Option[ByteBuffer]]
+ blockInfoManager.lockForReading(blockId) match {
+ case None =>
+ logDebug(s"Block $blockId was not found")
+ None
+ case Some(info) =>
+ Some(doGetLocalBytes(blockId, info))
+ }
}
}
- private def doGetLocal(blockId: BlockId, asBlockResult: Boolean):
Option[Any] = {
- blockInfoManager.lockForReading(blockId) match {
- case None =>
- logDebug(s"Block $blockId was not found")
- None
- case Some(info) =>
- val level = info.level
- logDebug(s"Level for block $blockId is $level")
-
- // Look for the block in memory
+ private def doGetLocalBytes(blockId: BlockId, info: BlockInfo):
ByteBuffer = {
--- End diff --
Comment that this is called with the read lock taken.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
