Skip to content

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

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

Closed
tsliwowicz wants to merge 5 commits into from
Closed

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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Code review comments fixed
  • Loading branch information
@tsliwowicz
tsliwowicz committed Oct 23, 2014
commit df9d98fe6703f6cc37fb0187fa55d140f37bb50e
15 changes: 7 additions & 8 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 @@ -190,8 +190,7 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus
blockManagerIdByExecutor -= blockManagerId.executorId

// Remove it from blockManagerInfo and remove all the blocks.
blockManagerInfo.remove(blockManagerId)

blockManagerInfo.remove(blockManagerId)
val iterator = info.blocks.keySet.iterator
while (iterator.hasNext) {
val blockId = iterator.next
Expand All @@ -202,7 +201,7 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus
}
}
listenerBus.post(SparkListenerBlockManagerRemoved(System.currentTimeMillis(), blockManagerId))
logInfo("removed " + blockManagerId)
logInfo(s"Removing block manager $blockManagerId")
}

private def expireDeadHosts() {
Expand Down Expand Up @@ -328,10 +327,10 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus

if (!blockManagerInfo.contains(id)) {
blockManagerIdByExecutor.get(id.executorId) match {
case Some(manager) =>
// A block manager of the same executor already exists so remove it (assumed dead).
case Some(oldId) =>
// 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)
+ " will remove, new Id %s, orig id - %s".format(id, oldId))
removeExecutor(id.executorId)
case None =>
}
Expand All @@ -340,8 +339,8 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus

blockManagerIdByExecutor(id.executorId) = id

blockManagerInfo(id) = new BlockManagerInfo(id, System.currentTimeMillis(),
maxMemSize, slaveActor)
blockManagerInfo(id) = new BlockManagerInfo(
id, System.currentTimeMillis(), maxMemSize, slaveActor)
}
listenerBus.post(SparkListenerBlockManagerAdded(time, id, maxMemSize))
}
Expand Down