Repository: spark Updated Branches: refs/heads/branch-1.6 76781950f -> 2588776ad
[MINOR][CORE][1.6-BACKPORT] Fix display wrong free memory size in the log ## What changes were proposed in this pull request? Free memory size displayed in the log is wrong (used memory), fix to make it correct. Backported to 1.6. ## How was this patch tested? N/A Author: jerryshao <ss...@hortonworks.com> Closes #14043 from jerryshao/memory-log-fix-1.6-backport. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2588776a Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2588776a Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2588776a Branch: refs/heads/branch-1.6 Commit: 2588776ad3d91e39300d61c8a12dc0803c28e866 Parents: 7678195 Author: jerryshao <ss...@hortonworks.com> Authored: Wed Jul 6 14:49:21 2016 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Wed Jul 6 14:49:21 2016 +0100 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/storage/MemoryStore.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/2588776a/core/src/main/scala/org/apache/spark/storage/MemoryStore.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/storage/MemoryStore.scala b/core/src/main/scala/org/apache/spark/storage/MemoryStore.scala index 17aae6e..aed0da9 100644 --- a/core/src/main/scala/org/apache/spark/storage/MemoryStore.scala +++ b/core/src/main/scala/org/apache/spark/storage/MemoryStore.scala @@ -393,7 +393,8 @@ private[spark] class MemoryStore(blockManager: BlockManager, memoryManager: Memo } val valuesOrBytes = if (deserialized) "values" else "bytes" logInfo("Block %s stored as %s in memory (estimated size %s, free %s)".format( - blockId, valuesOrBytes, Utils.bytesToString(size), Utils.bytesToString(blocksMemoryUsed))) + blockId, valuesOrBytes, Utils.bytesToString(size), + Utils.bytesToString(maxMemory - blocksMemoryUsed))) } else { // Tell the block manager that we couldn't put it in memory so that it can drop it to // disk if the block allows disk storage. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
