From 2314132d57878152a84325f86ea320bdbc7cca31 Mon Sep 17 00:00:00 2001 From: Matei Zaharia Date: Sun, 30 Sep 2012 22:52:16 -0700 Subject: Added a (failing) test for LRU with MEMORY_AND_DISK. --- core/src/main/scala/spark/storage/BlockManager.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/main') diff --git a/core/src/main/scala/spark/storage/BlockManager.scala b/core/src/main/scala/spark/storage/BlockManager.scala index 5384274d65..a66f812662 100644 --- a/core/src/main/scala/spark/storage/BlockManager.scala +++ b/core/src/main/scala/spark/storage/BlockManager.scala @@ -65,8 +65,8 @@ class BlockManager(val master: BlockManagerMaster, val serializer: Serializer, m private val locker = new BlockLocker(NUM_LOCKS) private val blockInfo = new ConcurrentHashMap[String, BlockInfo]() - private val memoryStore: BlockStore = new MemoryStore(this, maxMemory) - private val diskStore: BlockStore = new DiskStore(this, + private[storage] val memoryStore: BlockStore = new MemoryStore(this, maxMemory) + private[storage] val diskStore: BlockStore = new DiskStore(this, System.getProperty("spark.local.dir", System.getProperty("java.io.tmpdir"))) val connectionManager = new ConnectionManager(0) -- cgit v1.2.3