You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by td...@apache.org on 2014/05/09 07:34:15 UTC
git commit: Converted bang to ask to avoid scary warning when a block
is removed
Repository: spark
Updated Branches:
refs/heads/master 4c60fd1e8 -> 32868f31f
Converted bang to ask to avoid scary warning when a block is removed
Removing a block through the blockmanager gave a scary warning messages in the driver.
```
2014-05-08 20:16:19,172 WARN BlockManagerMasterActor: Got unknown message: true
2014-05-08 20:16:19,172 WARN BlockManagerMasterActor: Got unknown message: true
2014-05-08 20:16:19,172 WARN BlockManagerMasterActor: Got unknown message: true
```
This is because the [BlockManagerSlaveActor](https://github.com/apache/spark/blob/master/core/src/main/scala/org/apache/spark/storage/BlockManagerSlaveActor.scala#L44) would send back an acknowledgement ("true"). But the BlockManagerMasterActor would have sent the RemoveBlock message as a send, not as ask(), so would reject the receiver "true" as a unknown message.
@pwendell
Author: Tathagata Das <ta...@gmail.com>
Closes #708 from tdas/bm-fix and squashes the following commits:
ed4ef15 [Tathagata Das] Converted bang to ask to avoid scary warning when a block is removed.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/32868f31
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/32868f31
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/32868f31
Branch: refs/heads/master
Commit: 32868f31f88aebd580ab9329dc51a30c26af7a74
Parents: 4c60fd1
Author: Tathagata Das <ta...@gmail.com>
Authored: Thu May 8 22:34:08 2014 -0700
Committer: Tathagata Das <ta...@gmail.com>
Committed: Thu May 8 22:34:08 2014 -0700
----------------------------------------------------------------------
.../scala/org/apache/spark/storage/BlockManagerMasterActor.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/32868f31/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
index 98fa0df..6aed322 100644
--- a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
+++ b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
@@ -250,7 +250,7 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf, listenerBus
// Remove the block from the slave's BlockManager.
// Doesn't actually wait for a confirmation and the message might get lost.
// If message loss becomes frequent, we should add retry logic here.
- blockManager.get.slaveActor ! RemoveBlock(blockId)
+ blockManager.get.slaveActor.ask(RemoveBlock(blockId))(akkaTimeout)
}
}
}