You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/06/17 22:40:13 UTC
spark git commit: [SPARK-8161] Set externalBlockStoreInitialized to
be true, after ExternalBlockStore is initialized
Repository: spark
Updated Branches:
refs/heads/master 98ee3512b -> 7ad8c5d86
[SPARK-8161] Set externalBlockStoreInitialized to be true, after ExternalBlockStore is initialized
externalBlockStoreInitialized is never set to be true, which causes the blocks stored in ExternalBlockStore can not be removed.
Author: Mingfei <mi...@intel.com>
Closes #6702 from shimingfei/SetTrue and squashes the following commits:
add61d8 [Mingfei] Set externalBlockStoreInitialized to be true, after ExternalBlockStore is initialized
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7ad8c5d8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7ad8c5d8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7ad8c5d8
Branch: refs/heads/master
Commit: 7ad8c5d869555b1bf4b50eafdf80e057a0175941
Parents: 98ee351
Author: Mingfei <mi...@intel.com>
Authored: Wed Jun 17 13:40:07 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Wed Jun 17 13:40:07 2015 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/storage/BlockManager.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7ad8c5d8/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
----------------------------------------------------------------------
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 5048c7d..1beafa1 100644
--- a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
@@ -83,8 +83,10 @@ private[spark] class BlockManager(
private var externalBlockStoreInitialized = false
private[spark] val memoryStore = new MemoryStore(this, maxMemory)
private[spark] val diskStore = new DiskStore(this, diskBlockManager)
- private[spark] lazy val externalBlockStore: ExternalBlockStore =
+ private[spark] lazy val externalBlockStore: ExternalBlockStore = {
+ externalBlockStoreInitialized = true
new ExternalBlockStore(this, executorId)
+ }
private[spark]
val externalShuffleServiceEnabled = conf.getBoolean("spark.shuffle.service.enabled", false)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org