Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SPARK-4006] In long running contexts, we encountered the situation of double registe... #2886

Closed
wants to merge 5 commits into from
Closed

[SPARK-4006] In long running contexts, we encountered the situation of double registe... #2886

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f48bce9
In long running contexts, we encountered the situation of double regi…
tsliwowicz Oct 21, 2014
df9d98f
Code review comments fixed
tsliwowicz Oct 23, 2014
7bcfc3d
whitspaces fix
tsliwowicz Oct 23, 2014
41a2217
some more whitspaces change undone
tsliwowicz Oct 23, 2014
094d508
some more white space change undone
tsliwowicz Oct 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus
}
}
listenerBus.post(SparkListenerBlockManagerRemoved(System.currentTimeMillis(), blockManagerId))
logInfo(s"Removing block manager $blockManagerId")
}

private def expireDeadHosts() {
Expand Down Expand Up @@ -327,20 +328,20 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus
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)
case Some(oldId) =>
// already exists so remove it (assumed dead).
logError("Got two different block manager registrations on same executor - "
+ " will remove, new Id %s, orig id - %s".format(id, oldId))
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)
}
listenerBus.post(SparkListenerBlockManagerAdded(time, id, maxMemSize))
}
Expand Down