aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorwalker <walker@transwarp01.(none)>2014-01-07 01:21:25 +0800
committerwalker <walker@transwarp01.(none)>2014-01-07 01:21:25 +0800
commit6ab1db8071101a097a3508861aaa12550a5bf9d5 (patch)
tree742b0113b2eec6353392d2e63a28dff1bb5c99e4 /core
parenta0c6d96e270fc0bd26bfb7da0e3b2e40d934e1eb (diff)
downloadspark-6ab1db8071101a097a3508861aaa12550a5bf9d5.tar.gz
spark-6ab1db8071101a097a3508861aaa12550a5bf9d5.tar.bz2
spark-6ab1db8071101a097a3508861aaa12550a5bf9d5.zip
add inline comments
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
index 52a424db22..a028783757 100644
--- a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
+++ b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
@@ -348,6 +348,10 @@ object BlockManagerMasterActor {
if (storageLevel.isValid) {
// isValid means it is either stored in-memory or on-disk.
+ // But the memSize here indicates the data size in or dropped from memory,
+ // and the diskSize here indicates the data size in or dropped to disk.
+ // They can be both large than 0, when a block is dropped from memory to disk.
+ // Therefore, a safe way to set BlockStatus is to set its info in accurate modes.
if (storageLevel.useMemory) {
_blocks.put(blockId, BlockStatus(storageLevel, memSize, 0))
_remainingMem -= memSize