From eeed38eaf8c6912f3c51ba83903b67835a699f86 Mon Sep 17 00:00:00 2001 From: Shixiong Zhu Date: Tue, 6 Dec 2016 13:33:05 -0800 Subject: [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 Closes #16167 from zsxwing/remove-netty-workaround. --- .../src/main/java/org/apache/spark/network/util/TransportConf.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'common') 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; -- cgit v1.2.3