aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynold Xin <rxin@cs.berkeley.edu>2013-08-29 21:30:47 -0700
committerReynold Xin <rxin@cs.berkeley.edu>2013-08-29 21:30:47 -0700
commit15287766281195a019a400fe11b41e96c6edc362 (patch)
tree3a30c0cfb2dbb2c0711cb33a8d823397718f476e
parentabdbacf2521ec40ee03ecc8e1aae8823013f24f1 (diff)
parentf3dbe6b2158d6fdf1eef3841e9522b4236a3fa81 (diff)
downloadspark-15287766281195a019a400fe11b41e96c6edc362.tar.gz
spark-15287766281195a019a400fe11b41e96c6edc362.tar.bz2
spark-15287766281195a019a400fe11b41e96c6edc362.zip
Merge pull request #874 from jerryshao/fix-report-bug
Fix removed block zero size log reporting
-rw-r--r--core/src/main/scala/spark/storage/BlockManagerMasterActor.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/storage/BlockManagerMasterActor.scala b/core/src/main/scala/spark/storage/BlockManagerMasterActor.scala
index 2a2e178550..b7a981d101 100644
--- a/core/src/main/scala/spark/storage/BlockManagerMasterActor.scala
+++ b/core/src/main/scala/spark/storage/BlockManagerMasterActor.scala
@@ -372,12 +372,12 @@ object BlockManagerMasterActor {
if (blockStatus.storageLevel.useMemory) {
_remainingMem += blockStatus.memSize
logInfo("Removed %s on %s in memory (size: %s, free: %s)".format(
- blockId, blockManagerId.hostPort, Utils.bytesToString(memSize),
+ blockId, blockManagerId.hostPort, Utils.bytesToString(blockStatus.memSize),
Utils.bytesToString(_remainingMem)))
}
if (blockStatus.storageLevel.useDisk) {
logInfo("Removed %s on %s on disk (size: %s)".format(
- blockId, blockManagerId.hostPort, Utils.bytesToString(diskSize)))
+ blockId, blockManagerId.hostPort, Utils.bytesToString(blockStatus.diskSize)))
}
}
}