diff options
author | Adam Roberts <aroberts@uk.ibm.com> | 2016-09-15 10:40:10 -0700 |
---|---|---|
committer | Shixiong Zhu <shixiong@databricks.com> | 2016-09-15 10:40:10 -0700 |
commit | 0ad8eeb4d365c2fff5715ec22fbcf4c69c3340fd (patch) | |
tree | 518a32fd22885d96bffddc6f8f883aff75e5762c /common/network-common/src/main/java | |
parent | b479278142728eb003b9ee466fab0e8d6ec4b13d (diff) | |
download | spark-0ad8eeb4d365c2fff5715ec22fbcf4c69c3340fd.tar.gz spark-0ad8eeb4d365c2fff5715ec22fbcf4c69c3340fd.tar.bz2 spark-0ad8eeb4d365c2fff5715ec22fbcf4c69c3340fd.zip |
[SPARK-17379][BUILD] Upgrade netty-all to 4.0.41 final for bug fixes
## What changes were proposed in this pull request?
Upgrade netty-all to latest in the 4.0.x line which is 4.0.41, mentions several bug fixes and performance improvements we may find useful, see netty.io/news/2016/08/29/4-0-41-Final-4-1-5-Final.html. Initially tried to use 4.1.5 but noticed it's not backwards compatible.
## How was this patch tested?
Existing unit tests against branch-1.6 and branch-2.0 using IBM Java 8 on Intel, Power and Z architectures
Author: Adam Roberts <aroberts@uk.ibm.com>
Closes #14961 from a-roberts/netty.
Diffstat (limited to 'common/network-common/src/main/java')
-rw-r--r-- | common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java | 5 |
1 files changed, 5 insertions, 0 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 0efc400aa3..7d5baa9a9c 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 @@ -23,6 +23,11 @@ import com.google.common.primitives.Ints; * A central location that tracks all the settings we expose to users. */ 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; |