You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/07/16 06:21:55 UTC
git commit: [SPARK-2500] Move the logInfo for registering
BlockManager to BlockManagerMasterActor.register method
Repository: spark
Updated Branches:
refs/heads/master 4576d80a5 -> 9c12de509
[SPARK-2500] Move the logInfo for registering BlockManager to BlockManagerMasterActor.register method
PR for SPARK-2500
Move the logInfo call for BlockManager to BlockManagerMasterActor.register instead of BlockManagerInfo constructor.
Previously the loginfo call for registering the registering a BlockManager is happening in the BlockManagerInfo constructor. This kind of confusing because the code could call "new BlockManagerInfo" without actually registering a BlockManager and could confuse when reading the log files.
Author: Henry Saputra <he...@gmail.com>
Closes #1424 from hsaputra/move_registerblockmanager_log_to_registration_method and squashes the following commits:
3370b4a [Henry Saputra] Move the loginfo for BlockManager to BlockManagerMasterActor.register instead of BlockManagerInfo constructor.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9c12de50
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9c12de50
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9c12de50
Branch: refs/heads/master
Commit: 9c12de5092312319aa22f24df47a6de0e41a0102
Parents: 4576d80
Author: Henry Saputra <he...@gmail.com>
Authored: Tue Jul 15 21:21:52 2014 -0700
Committer: Reynold Xin <rx...@apache.org>
Committed: Tue Jul 15 21:21:52 2014 -0700
----------------------------------------------------------------------
.../org/apache/spark/storage/BlockManagerMasterActor.scala | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9c12de50/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
----------------------------------------------------------------------
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 6aed322..de1cc55 100644
--- a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
+++ b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
@@ -336,6 +336,10 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus
case None =>
blockManagerIdByExecutor(id.executorId) = id
}
+
+ logInfo("Registering block manager %s with %s RAM".format(
+ id.hostPort, Utils.bytesToString(maxMemSize)))
+
blockManagerInfo(id) =
new BlockManagerInfo(id, System.currentTimeMillis(), maxMemSize, slaveActor)
}
@@ -432,9 +436,6 @@ private[spark] class BlockManagerInfo(
// Mapping from block id to its status.
private val _blocks = new JHashMap[BlockId, BlockStatus]
- logInfo("Registering block manager %s with %s RAM".format(
- blockManagerId.hostPort, Utils.bytesToString(maxMem)))
-
def getStatus(blockId: BlockId) = Option(_blocks.get(blockId))
def updateLastSeenMs() {