diff options
| author | Shixiong Zhu <shixiong@databricks.com> | 2016-12-06 13:33:05 -0800 |
|---|---|---|
| committer | Shixiong Zhu <shixiong@databricks.com> | 2016-12-06 13:33:05 -0800 |
| commit | eeed38eaf8c6912f3c51ba83903b67835a699f86 (patch) | |
| tree | b6cb607035f03ecf22d6dc0486950165bffa7ea5 /common | |
| parent | fac5b75b74b2d76b6314c69be3c769f1f321688c (diff) | |
| download | spark-eeed38eaf8c6912f3c51ba83903b67835a699f86.tar.gz spark-eeed38eaf8c6912f3c51ba83903b67835a699f86.tar.bz2 spark-eeed38eaf8c6912f3c51ba83903b67835a699f86.zip | |
[SPARK-18744][CORE] Remove workaround for Netty memory leak
## What changes were proposed in this pull request?
We added some codes in https://github.com/apache/spark/pull/14961 because of https://github.com/netty/netty/issues/5833
Now we can remove them as it's fixed in Netty 4.0.42.Final.
## How was this patch tested?
Jenkins
Author: Shixiong Zhu <shixiong@databricks.com>
Closes #16167 from zsxwing/remove-netty-workaround.
Diffstat (limited to 'common')
| -rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java b/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java index 012bb098f6..fa050363b1 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java +++ b/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java @@ -24,11 +24,6 @@ import com.google.common.primitives.Ints; */ public class TransportConf { - static { - // Set this due to Netty PR #5661 for Netty 4.0.37+ to work - System.setProperty("io.netty.maxDirectMemory", "0"); - } - private final String SPARK_NETWORK_IO_MODE_KEY; private final String SPARK_NETWORK_IO_PREFERDIRECTBUFS_KEY; private final String SPARK_NETWORK_IO_CONNECTIONTIMEOUT_KEY; |