Skip to content
Snippets Groups Projects
Unverified Commit 89335514 authored by Guoqiang Li's avatar Guoqiang Li Committed by Sean Owen
Browse files

[SPARK-18375][SPARK-18383][BUILD][CORE] Upgrade netty to 4.0.42.Final


## What changes were proposed in this pull request?

One of the important changes for 4.0.42.Final is "Support any FileRegion implementation when using epoll transport netty/netty#5825".
In 4.0.42.Final, `MessageWithHeader` can work properly when `spark.[shuffle|rpc].io.mode` is set to epoll

## How was this patch tested?

Existing tests

Author: Guoqiang Li <witgo@qq.com>

Closes #15830 from witgo/SPARK-18375_netty-4.0.42.

(cherry picked from commit bc41d997)
Signed-off-by: default avatarSean Owen <sowen@cloudera.com>
parent 56859c02
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,7 @@ import scala.reflect.ClassTag ...@@ -39,6 +39,7 @@ import scala.reflect.ClassTag
import scala.util.Try import scala.util.Try
import scala.util.control.{ControlThrowable, NonFatal} import scala.util.control.{ControlThrowable, NonFatal}
import _root_.io.netty.channel.unix.Errors.NativeIoException
import com.google.common.cache.{CacheBuilder, CacheLoader, LoadingCache} import com.google.common.cache.{CacheBuilder, CacheLoader, LoadingCache}
import com.google.common.io.{ByteStreams, Files => GFiles} import com.google.common.io.{ByteStreams, Files => GFiles}
import com.google.common.net.InetAddresses import com.google.common.net.InetAddresses
...@@ -2222,6 +2223,9 @@ private[spark] object Utils extends Logging { ...@@ -2222,6 +2223,9 @@ private[spark] object Utils extends Logging {
isBindCollision(e.getCause) isBindCollision(e.getCause)
case e: MultiException => case e: MultiException =>
e.getThrowables.asScala.exists(isBindCollision) e.getThrowables.asScala.exists(isBindCollision)
case e: NativeIoException =>
(e.getMessage != null && e.getMessage.startsWith("bind() failed: ")) ||
isBindCollision(e.getCause)
case e: Exception => isBindCollision(e.getCause) case e: Exception => isBindCollision(e.getCause)
case _ => false case _ => false
} }
......
...@@ -123,7 +123,7 @@ metrics-json-3.1.2.jar ...@@ -123,7 +123,7 @@ metrics-json-3.1.2.jar
metrics-jvm-3.1.2.jar metrics-jvm-3.1.2.jar
minlog-1.3.0.jar minlog-1.3.0.jar
netty-3.8.0.Final.jar netty-3.8.0.Final.jar
netty-all-4.0.41.Final.jar netty-all-4.0.42.Final.jar
objenesis-2.1.jar objenesis-2.1.jar
opencsv-2.3.jar opencsv-2.3.jar
oro-2.0.8.jar oro-2.0.8.jar
......
...@@ -130,7 +130,7 @@ metrics-jvm-3.1.2.jar ...@@ -130,7 +130,7 @@ metrics-jvm-3.1.2.jar
minlog-1.3.0.jar minlog-1.3.0.jar
mx4j-3.0.2.jar mx4j-3.0.2.jar
netty-3.8.0.Final.jar netty-3.8.0.Final.jar
netty-all-4.0.41.Final.jar netty-all-4.0.42.Final.jar
objenesis-2.1.jar objenesis-2.1.jar
opencsv-2.3.jar opencsv-2.3.jar
oro-2.0.8.jar oro-2.0.8.jar
......
...@@ -130,7 +130,7 @@ metrics-jvm-3.1.2.jar ...@@ -130,7 +130,7 @@ metrics-jvm-3.1.2.jar
minlog-1.3.0.jar minlog-1.3.0.jar
mx4j-3.0.2.jar mx4j-3.0.2.jar
netty-3.8.0.Final.jar netty-3.8.0.Final.jar
netty-all-4.0.41.Final.jar netty-all-4.0.42.Final.jar
objenesis-2.1.jar objenesis-2.1.jar
opencsv-2.3.jar opencsv-2.3.jar
oro-2.0.8.jar oro-2.0.8.jar
......
...@@ -138,7 +138,7 @@ metrics-jvm-3.1.2.jar ...@@ -138,7 +138,7 @@ metrics-jvm-3.1.2.jar
minlog-1.3.0.jar minlog-1.3.0.jar
mx4j-3.0.2.jar mx4j-3.0.2.jar
netty-3.8.0.Final.jar netty-3.8.0.Final.jar
netty-all-4.0.41.Final.jar netty-all-4.0.42.Final.jar
objenesis-2.1.jar objenesis-2.1.jar
opencsv-2.3.jar opencsv-2.3.jar
oro-2.0.8.jar oro-2.0.8.jar
......
...@@ -139,7 +139,7 @@ metrics-jvm-3.1.2.jar ...@@ -139,7 +139,7 @@ metrics-jvm-3.1.2.jar
minlog-1.3.0.jar minlog-1.3.0.jar
mx4j-3.0.2.jar mx4j-3.0.2.jar
netty-3.8.0.Final.jar netty-3.8.0.Final.jar
netty-all-4.0.41.Final.jar netty-all-4.0.42.Final.jar
objenesis-2.1.jar objenesis-2.1.jar
opencsv-2.3.jar opencsv-2.3.jar
oro-2.0.8.jar oro-2.0.8.jar
......
...@@ -552,7 +552,7 @@ ...@@ -552,7 +552,7 @@
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
<version>4.0.41.Final</version> <version>4.0.42.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment