Github user andrewor14 commented on a diff in the pull request:
https://github.com/apache/spark/pull/2886#discussion_r19250038
--- Diff:
core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala ---
@@ -325,22 +325,23 @@ class BlockManagerMasterActor(val isLocal: Boolean,
conf: SparkConf, listenerBus
private def register(id: BlockManagerId, maxMemSize: Long, slaveActor:
ActorRef) {
val time = System.currentTimeMillis()
+
if (!blockManagerInfo.contains(id)) {
blockManagerIdByExecutor.get(id.executorId) match {
case Some(manager) =>
- // A block manager of the same executor already exists.
- // This should never happen. Let's just quit.
- logError("Got two different block manager registrations on " +
id.executorId)
- System.exit(1)
+ // A block manager of the same executor already exists so remove
it (assumed dead).
+ logError("Got two different block manager registrations on same
executor - "
+ + " will remove, new Id " + id + ", orig id - " + manager)
+ removeExecutor(id.executorId)
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, time, maxMemSize, slaveActor)
+ logInfo("Registering block manager %s with %s RAM, %s".format(
+ id.hostPort, Utils.bytesToString(maxMemSize), id))
+
+ blockManagerIdByExecutor(id.executorId) = id
+
+ blockManagerInfo(id) = new BlockManagerInfo(id,
System.currentTimeMillis(),
+ maxMemSize, slaveActor)
--- End diff --
Can you use this format
```
blockManagerInfo(id) = new BlockManagerInfo(
id, System.currentTimeMillis, maxMemSize, slaveActor)
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
