From 264533b553be806b6c45457201952e83c028ec78 Mon Sep 17 00:00:00 2001 From: huangzhaowei Date: Wed, 24 Feb 2016 23:52:17 -0800 Subject: [SPARK-13482][MINOR][CONFIGURATION] Make consistency of the configuraiton named in TransportConf. `spark.storage.memoryMapThreshold` has two kind of the value, one is 2*1024*1024 as integer and the other one is '2m' as string. "2m" is recommanded in document but it will go wrong if the code goes into `TransportConf#memoryMapBytes`. [Jira](https://issues.apache.org/jira/browse/SPARK-13482) Author: huangzhaowei Closes #11360 from SaintBacchus/SPARK-13482. --- .../src/main/java/org/apache/spark/network/util/TransportConf.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'network') diff --git a/network/common/src/main/java/org/apache/spark/network/util/TransportConf.java b/network/common/src/main/java/org/apache/spark/network/util/TransportConf.java index 115135d44a..9f030da2b3 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/TransportConf.java +++ b/network/common/src/main/java/org/apache/spark/network/util/TransportConf.java @@ -132,7 +132,8 @@ public class TransportConf { * memory mapping has high overhead for blocks close to or below the page size of the OS. */ public int memoryMapBytes() { - return conf.getInt("spark.storage.memoryMapThreshold", 2 * 1024 * 1024); + return Ints.checkedCast(JavaUtils.byteStringAsBytes( + conf.get("spark.storage.memoryMapThreshold", "2m"))); } /** -- cgit v1.2.3