Skip to content

[SPARK-4005][CORE] handle message replies in receive instead of in the individual private methods #2853

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
wants to merge 4 commits into from
Closed

[SPARK-4005][CORE] handle message replies in receive instead of in the individual private methods #2853

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4b929b
[SPARK-4005][CORE] handle message replies in receive instead of in th…
liyezhang556520 Oct 20, 2014
242166b
modified accroding to the comments
liyezhang556520 Dec 5, 2014
bf518cd
change the indent
liyezhang556520 Dec 5, 2014
9b06f0a
remove the unreachable code
liyezhang556520 Dec 5, 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
18 changes: 8 additions & 10 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 @@ -73,9 +73,8 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus

case UpdateBlockInfo(
blockManagerId, blockId, storageLevel, deserializedSize, size, tachyonSize) =>
// TODO: Ideally we want to handle all the message replies in receive instead of in the
// individual private methods.
updateBlockInfo(blockManagerId, blockId, storageLevel, deserializedSize, size, tachyonSize)
sender ! updateBlockInfo(
blockManagerId, blockId, storageLevel, deserializedSize, size, tachyonSize)

case GetLocations(blockId) =>
sender ! getLocations(blockId)
Expand Down Expand Up @@ -351,23 +350,22 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus
storageLevel: StorageLevel,
memSize: Long,
diskSize: Long,
tachyonSize: Long) {
tachyonSize: Long): Boolean = {

if (!blockManagerInfo.contains(blockManagerId)) {
if (blockManagerId.isDriver && !isLocal) {
// We intentionally do not register the master (except in local mode),
// so we should not indicate failure.
sender ! true
return true
} else {
sender ! false
return false
}
return
return true
Copy link
Contributor

@JoshRosen JoshRosen Dec 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I think you should just remove this line since it's unreachable.

Copy link
Contributor Author

@liyezhang556520 liyezhang556520 Dec 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, remove the line will be the same logic with the original one.

}

if (blockId == null) {
blockManagerInfo(blockManagerId).updateLastSeenMs()
sender ! true
return
return true
}

blockManagerInfo(blockManagerId).updateBlockInfo(
Expand All @@ -391,7 +389,7 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus
if (locations.size == 0) {
blockLocations.remove(blockId)
}
sender ! true
true
}

private def getLocations(blockId: BlockId): Seq[BlockManagerId] = {
Expand Down