Github user rxin commented on a diff in the pull request:
https://github.com/apache/spark/pull/1499#discussion_r15544259
--- Diff:
core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala ---
@@ -54,12 +55,16 @@ private[spark] class DiskBlockManager(shuffleManager:
ShuffleBlockManager, rootD
addShutdownHook()
/**
- * Returns the physical file segment in which the given BlockId is
located.
- * If the BlockId has been mapped to a specific FileSegment, that will
be returned.
- * Otherwise, we assume the Block is mapped to a whole file identified
by the BlockId directly.
+ * Returns the physical file segment in which the given BlockId is
located. If the BlockId has
+ * been mapped to a specific FileSegment by the shuffle layer, that will
be returned.
+ * Otherwise, we assume the Block is mapped to the whole file identified
by the BlockId.
*/
def getBlockLocation(blockId: BlockId): FileSegment = {
- if (blockId.isShuffle && shuffleManager.consolidateShuffleFiles) {
+ val env = SparkEnv.get
+ if (blockId.isShuffle && env != null &&
env.shuffleManager.isInstanceOf[SortShuffleManager]) {
--- End diff --
add comment inline to explain env is null in tests
---
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.
---
