aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorReynold Xin <rxin@apache.org>2014-06-18 12:48:58 -0700
committerReynold Xin <rxin@apache.org>2014-06-18 12:48:58 -0700
commitdd96fcda0145810785b67f847f98b04ff7f0d7c3 (patch)
treebeaad5e0a638f331939969c5d9aee8b3ccb34758 /core
parent5ad5e3486aa4d13b0991de13f5f17d9897dd2753 (diff)
downloadspark-dd96fcda0145810785b67f847f98b04ff7f0d7c3.tar.gz
spark-dd96fcda0145810785b67f847f98b04ff7f0d7c3.tar.bz2
spark-dd96fcda0145810785b67f847f98b04ff7f0d7c3.zip
Updated the comment for SPARK-2162.
A follow up on #1103 @andrewor14 Author: Reynold Xin <rxin@apache.org> Closes #1117 from rxin/SPARK-2162 and squashes the following commits: a4231de [Reynold Xin] Updated the comment for SPARK-2162.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/storage/BlockManager.scala10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
index 373987c122..d2f7baf928 100644
--- a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
@@ -363,11 +363,13 @@ private[spark] class BlockManager(
val info = blockInfo.get(blockId).orNull
if (info != null) {
info.synchronized {
- // Double check to make sure the block is still there, since removeBlock
- // method also synchronizes on BlockInfo object, so the block might have
- // been removed when we actually come here.
+ // Double check to make sure the block is still there. There is a small chance that the
+ // block has been removed by removeBlock (which also synchronizes on the blockInfo object).
+ // Note that this only checks metadata tracking. If user intentionally deleted the block
+ // on disk or from off heap storage without using removeBlock, this conditional check will
+ // still pass but eventually we will get an exception because we can't find the block.
if (blockInfo.get(blockId).isEmpty) {
- logDebug(s"Block $blockId had been removed")
+ logWarning(s"Block $blockId had been removed")
return None
}