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
some more whitspaces change undone
  • Loading branch information
@tsliwowicz
tsliwowicz committed Oct 23, 2014
commit 41a22176788bee43b4ee527c1fc295f81f07d343
3 changes: 1 addition & 2 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 @@ -192,7 +192,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 Down Expand Up @@ -326,7 +326,6 @@ 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(oldId) =>
Expand Down