diff options
| author | lewuathe <lewuathe@me.com> | 2015-01-11 13:50:42 -0800 |
|---|---|---|
| committer | Aaron Davidson <aaron@databricks.com> | 2015-01-11 13:50:42 -0800 |
| commit | 1656aae2b4e8b026f8cfe782519f72d32ed2b291 (patch) | |
| tree | 1b3e35b9bbcd34015499b1ff7bc28702cdf20524 /core | |
| parent | 33132609096d7fa45001c6a67724ec60bcaefaa9 (diff) | |
| download | spark-1656aae2b4e8b026f8cfe782519f72d32ed2b291.tar.gz spark-1656aae2b4e8b026f8cfe782519f72d32ed2b291.tar.bz2 spark-1656aae2b4e8b026f8cfe782519f72d32ed2b291.zip | |
[SPARK-5073] spark.storage.memoryMapThreshold have two default value
Because major OS page sizes is about 4KB, the default value of spark.storage.memoryMapThreshold is integrated to 2 * 4096
Author: lewuathe <lewuathe@me.com>
Closes #3900 from Lewuathe/integrate-memoryMapThreshold and squashes the following commits:
e417acd [lewuathe] [SPARK-5073] Update docs/configuration
834aba4 [lewuathe] [SPARK-5073] Fix style
adcea33 [lewuathe] [SPARK-5073] Integrate memory map threshold to 2MB
fcce2e5 [lewuathe] [SPARK-5073] spark.storage.memoryMapThreshold have two default value
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/storage/DiskStore.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/storage/DiskStore.scala b/core/src/main/scala/org/apache/spark/storage/DiskStore.scala index 8dadf67940..61ef5ff168 100644 --- a/core/src/main/scala/org/apache/spark/storage/DiskStore.scala +++ b/core/src/main/scala/org/apache/spark/storage/DiskStore.scala @@ -31,7 +31,8 @@ import org.apache.spark.util.Utils private[spark] class DiskStore(blockManager: BlockManager, diskManager: DiskBlockManager) extends BlockStore(blockManager) with Logging { - val minMemoryMapBytes = blockManager.conf.getLong("spark.storage.memoryMapThreshold", 2 * 4096L) + val minMemoryMapBytes = blockManager.conf.getLong( + "spark.storage.memoryMapThreshold", 2 * 1024L * 1024L) override def getSize(blockId: BlockId): Long = { diskManager.getFile(blockId.name).length |