You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2016/11/12 09:49:20 UTC
spark git commit: [SPARK-18375][SPARK-18383][BUILD][CORE] Upgrade
netty to 4.0.42.Final
Repository: spark
Updated Branches:
refs/heads/master 3af894511 -> bc41d997e
[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 <wi...@qq.com>
Closes #15830 from witgo/SPARK-18375_netty-4.0.42.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bc41d997
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bc41d997
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bc41d997
Branch: refs/heads/master
Commit: bc41d997ea287080f549219722b6d9049adef4e2
Parents: 3af8945
Author: Guoqiang Li <wi...@qq.com>
Authored: Sat Nov 12 09:49:14 2016 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Sat Nov 12 09:49:14 2016 +0000
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/util/Utils.scala | 4 ++++
dev/deps/spark-deps-hadoop-2.2 | 2 +-
dev/deps/spark-deps-hadoop-2.3 | 2 +-
dev/deps/spark-deps-hadoop-2.4 | 2 +-
dev/deps/spark-deps-hadoop-2.6 | 2 +-
dev/deps/spark-deps-hadoop-2.7 | 2 +-
pom.xml | 2 +-
7 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/bc41d997/core/src/main/scala/org/apache/spark/util/Utils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala
index c27cbe3..d341982 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -39,6 +39,7 @@ import scala.reflect.ClassTag
import scala.util.Try
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.io.{ByteStreams, Files => GFiles}
import com.google.common.net.InetAddresses
@@ -2222,6 +2223,9 @@ private[spark] object Utils extends Logging {
isBindCollision(e.getCause)
case e: MultiException =>
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 _ => false
}
http://git-wip-us.apache.org/repos/asf/spark/blob/bc41d997/dev/deps/spark-deps-hadoop-2.2
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index 6e749ac..bbdea06 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -123,7 +123,7 @@ metrics-json-3.1.2.jar
metrics-jvm-3.1.2.jar
minlog-1.3.0.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
opencsv-2.3.jar
oro-2.0.8.jar
http://git-wip-us.apache.org/repos/asf/spark/blob/bc41d997/dev/deps/spark-deps-hadoop-2.3
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index 515995a..a2dec41 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -130,7 +130,7 @@ metrics-jvm-3.1.2.jar
minlog-1.3.0.jar
mx4j-3.0.2.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
opencsv-2.3.jar
oro-2.0.8.jar
http://git-wip-us.apache.org/repos/asf/spark/blob/bc41d997/dev/deps/spark-deps-hadoop-2.4
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index d2139fd..c1f02b9 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -130,7 +130,7 @@ metrics-jvm-3.1.2.jar
minlog-1.3.0.jar
mx4j-3.0.2.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
opencsv-2.3.jar
oro-2.0.8.jar
http://git-wip-us.apache.org/repos/asf/spark/blob/bc41d997/dev/deps/spark-deps-hadoop-2.6
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index b5cecf7..4f04636 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -138,7 +138,7 @@ metrics-jvm-3.1.2.jar
minlog-1.3.0.jar
mx4j-3.0.2.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
opencsv-2.3.jar
oro-2.0.8.jar
http://git-wip-us.apache.org/repos/asf/spark/blob/bc41d997/dev/deps/spark-deps-hadoop-2.7
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index a5e03a7..da3af9f 100644
--- a/dev/deps/spark-deps-hadoop-2.7
+++ b/dev/deps/spark-deps-hadoop-2.7
@@ -139,7 +139,7 @@ metrics-jvm-3.1.2.jar
minlog-1.3.0.jar
mx4j-3.0.2.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
opencsv-2.3.jar
oro-2.0.8.jar
http://git-wip-us.apache.org/repos/asf/spark/blob/bc41d997/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8aa0a6c..650b4cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -552,7 +552,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.41.Final</version>
+ <version>4.0.42.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org