Use flag instead of name check.

core/src/main/scala/org/apache/spark/storage/BlockManager.scala

@@ -523,8 +523,7 @@ private[spark] class BlockManager(
     val file = diskBlockManager.createBlockFile(blockId, filename, allowAppending =  true)
     val writer = new DiskBlockObjectWriter(blockId, file, serializer, bufferSize, compressStream)
     writer.registerCloseEventHandler(() => {
-      if (blockId.name != filename) {
-        // Avoid producing mappings if we're using unique filenames for blocks.
+      if (shuffleBlockManager.consolidateShuffleFiles) {
         diskBlockManager.mapBlockToFileSegment(blockId, writer.fileSegment())
       }
       val myInfo = new BlockInfo(StorageLevel.DISK_ONLY, false)