diff options
| author | Mingfei <mingfei.shi@intel.com> | 2015-06-17 13:40:07 -0700 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-06-17 13:40:07 -0700 |
| commit | 7ad8c5d869555b1bf4b50eafdf80e057a0175941 (patch) | |
| tree | 0ee5b609d0166e1c2b51bbd3a3c72c5f2b315349 /core | |
| parent | 98ee3512b26e87eeb22693a4a61b2c4981f38ca4 (diff) | |
| download | spark-7ad8c5d869555b1bf4b50eafdf80e057a0175941.tar.gz spark-7ad8c5d869555b1bf4b50eafdf80e057a0175941.tar.bz2 spark-7ad8c5d869555b1bf4b50eafdf80e057a0175941.zip | |
[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 <mingfei.shi@intel.com>
Closes #6702 from shimingfei/SetTrue and squashes the following commits:
add61d8 [Mingfei] Set externalBlockStoreInitialized to be true, after ExternalBlockStore is initialized
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/storage/BlockManager.scala | 4 |
1 files changed, 3 insertions, 1 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 5048c7dab2..1beafa1771 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) |