Skip to content

Commit 8adfcfa

Browse files
committed
address arron's comment on inTachyonSize
1 parent 120e48a commit 8adfcfa

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ private[spark] class BlockManager(
257257
if (info.tellMaster) {
258258
val storageLevel = status.storageLevel
259259
val inMemSize = Math.max(status.memSize, droppedMemorySize)
260-
val inTachyonSize = Math.max(status.tachyonSize, droppedMemorySize)
260+
val inTachyonSize = status.tachyonSize
261261
val onDiskSize = status.diskSize
262262
master.updateBlockInfo(
263263
blockManagerId, blockId, storageLevel, inMemSize, onDiskSize, inTachyonSize)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ private[spark] class BlockManagerInfo(
357357
}
358358

359359
if (storageLevel.isValid) {
360-
/* isValid means it is either stored in-memory or on-disk.
360+
/* isValid means it is either stored in-memory, on-disk or on-Tachyon.
361361
* But the memSize here indicates the data size in or dropped from memory,
362362
* tachyonSize here indicates the data size in or dropped from Tachyon,
363363
* and the diskSize here indicates the data size in or dropped to disk.

0 commit comments

Comments
 (0)