You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2014/11/11 02:25:54 UTC
hadoop git commit: HADOOP-9576. Changed NetUtils#wrapException to
throw EOFException instead of wrapping it as IOException. Contributed by
Steve Loughran
Repository: hadoop
Updated Branches:
refs/heads/trunk 2cc868ded -> 86bf8c719
HADOOP-9576. Changed NetUtils#wrapException to throw EOFException instead of wrapping it as IOException. Contributed by Steve Loughran
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/86bf8c71
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/86bf8c71
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/86bf8c71
Branch: refs/heads/trunk
Commit: 86bf8c7193013834f67e03bd67a320cc080ef32c
Parents: 2cc868d
Author: Jian He <ji...@apache.org>
Authored: Mon Nov 10 17:17:01 2014 -0800
Committer: Jian He <ji...@apache.org>
Committed: Mon Nov 10 17:25:29 2014 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/net/NetUtils.java | 8 ++++++++
.../test/java/org/apache/hadoop/net/TestNetUtils.java | 12 ++++++++++++
3 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/86bf8c71/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 51266a8..26c39cf 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -422,6 +422,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11294. Nfs3FileAttributes should not change the values of rdev,
nlink and size in the constructor. (Brandon Li via wheat9)
+ HADOOP-9576. Changed NetUtils#wrapException to throw EOFException instead
+ of wrapping it as IOException. (Steve Loughran via jianhe)
+
Release 2.6.0 - 2014-11-15
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/86bf8c71/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
index 9ee0f3e..b535dda 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.net;
+import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -759,6 +760,13 @@ public class NetUtils {
+ " failed on socket timeout exception: " + exception
+ ";"
+ see("NoRouteToHost"));
+ } else if (exception instanceof EOFException) {
+ return wrapWithMessage(exception,
+ "End of File Exception between "
+ + getHostDetailsAsString(destHost, destPort, localHost)
+ + ": " + exception
+ + ";"
+ + see("EOFException"));
}
else {
return (IOException) new IOException("Failed on local exception: "
http://git-wip-us.apache.org/repos/asf/hadoop/blob/86bf8c71/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
index b03afca..319e8a9 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.net;
import static org.junit.Assert.*;
+import java.io.EOFException;
import java.io.IOException;
import java.net.BindException;
import java.net.ConnectException;
@@ -257,6 +258,17 @@ public class TestNetUtils {
}
@Test
+ public void testWrapEOFException() throws Throwable {
+ IOException e = new EOFException("eof");
+ IOException wrapped = verifyExceptionClass(e, EOFException.class);
+ assertInException(wrapped, "eof");
+ assertWikified(wrapped);
+ assertInException(wrapped, "localhost");
+ assertRemoteDetailsIncluded(wrapped);
+ assertInException(wrapped, "/EOFException");
+ }
+
+ @Test
public void testGetConnectAddress() throws IOException {
NetUtils.addStaticResolution("host", "127.0.0.1");
InetSocketAddress addr = NetUtils.createSocketAddrForHost("host", 1);