Github user andrewor14 commented on a diff in the pull request: https://github.com/apache/spark/pull/2854#discussion_r19104791 --- Diff: core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala --- @@ -223,18 +231,24 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf) extends Act } private def register(id: BlockManagerId, maxMemSize: Long, slaveActor: ActorRef) { + logInfo("Registering block manager %s with %s RAM, %s".format(id.hostPort, Utils.bytesToString(maxMemSize), id)) + 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) --- End diff -- We have a 100 character limit per line for Spark PRs.
--- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org