aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMingfei <mingfei.shi@intel.com>2014-11-18 22:17:06 -0800
committerPatrick Wendell <pwendell@gmail.com>2014-11-18 22:17:06 -0800
commit165cec9c468d9dcf5e83f6d43cbb512a98da846c (patch)
treeb260557a5434a51058b15806a03b1d741305aa4c
parent67e9876b3e457b151c123fdb5ac2d8e8371e6acf (diff)
downloadspark-165cec9c468d9dcf5e83f6d43cbb512a98da846c.tar.gz
spark-165cec9c468d9dcf5e83f6d43cbb512a98da846c.tar.bz2
spark-165cec9c468d9dcf5e83f6d43cbb512a98da846c.zip
[Spark-4432]close InStream after the block is accessed
InStream is not closed after data is read from Tachyon. which makes the blocks in Tachyon locked after accessed. Author: Mingfei <mingfei.shi@intel.com> Closes #3290 from shimingfei/lockFix and squashes the following commits: fffe345 [Mingfei] close InStream after the block is accessed
-rw-r--r--core/src/main/scala/org/apache/spark/storage/TachyonStore.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/storage/TachyonStore.scala b/core/src/main/scala/org/apache/spark/storage/TachyonStore.scala
index 6dbad5ff05..233d1e2b7c 100644
--- a/core/src/main/scala/org/apache/spark/storage/TachyonStore.scala
+++ b/core/src/main/scala/org/apache/spark/storage/TachyonStore.scala
@@ -116,6 +116,8 @@ private[spark] class TachyonStore(
case ioe: IOException =>
logWarning(s"Failed to fetch the block $blockId from Tachyon", ioe)
None
+ } finally {
+ is.close()
}
}