hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [18/50] hadoop git commit: HDFS-9905. WebHdfsFileSystem#runWithRetry should display original stack trace on error. (Wei-Chiu Chuang via iwasakims)
Date Tue, 03 May 2016 22:06:05 GMT
HDFS-9905. WebHdfsFileSystem#runWithRetry should display original stack trace on error. (Wei-Chiu
Chuang via iwasakims)

(cherry picked from commit 6fcde2e38da04cae3aad6b13cf442af211f71506)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c4d8090b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c4d8090b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c4d8090b

Branch: refs/heads/branch-2.8
Commit: c4d8090b7291d942e80685975de337060dc7d153
Parents: 358b54d
Author: Masatake Iwasaki <iwasakims@apache.org>
Authored: Sat Apr 23 23:37:56 2016 +0900
Committer: Masatake Iwasaki <iwasakims@apache.org>
Committed: Sat Apr 23 23:55:27 2016 +0900

----------------------------------------------------------------------
 .../hadoop/hdfs/web/WebHdfsFileSystem.java      |  6 +++--
 .../hadoop/hdfs/web/TestWebHdfsTimeouts.java    | 25 +++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4d8090b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
index 6a90be5..03b372e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
@@ -737,8 +737,10 @@ public class WebHdfsFileSystem extends FileSystem
             node = url.getAuthority();
           }
           try {
-              ioe = ioe.getClass().getConstructor(String.class)
-                    .newInstance(node + ": " + ioe.getMessage());
+            IOException newIoe = ioe.getClass().getConstructor(String.class)
+                .newInstance(node + ": " + ioe.getMessage());
+            newIoe.setStackTrace(ioe.getStackTrace());
+            ioe = newIoe;
           } catch (NoSuchMethodException | SecurityException 
                    | InstantiationException | IllegalAccessException
                    | IllegalArgumentException | InvocationTargetException e) {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4d8090b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTimeouts.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTimeouts.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTimeouts.java
index 664e32d..67c39e1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTimeouts.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTimeouts.java
@@ -18,7 +18,6 @@
 
 package org.apache.hadoop.hdfs.web;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import java.io.BufferedReader;
@@ -46,6 +45,7 @@ import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.security.authentication.client.ConnectionConfigurator;
+import org.apache.hadoop.test.GenericTestUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.runner.RunWith;
@@ -150,7 +150,8 @@ public class TestWebHdfsTimeouts {
       fs.listFiles(new Path("/"), false);
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
-      assertEquals(fs.getUri().getAuthority() + ": connect timed out", e.getMessage());
+      GenericTestUtils.assertExceptionContains(fs.getUri().getAuthority()
+          + ": connect timed out",e);
     }
   }
 
@@ -163,7 +164,8 @@ public class TestWebHdfsTimeouts {
       fs.listFiles(new Path("/"), false);
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
-      assertEquals(fs.getUri().getAuthority() + ": Read timed out", e.getMessage());
+      GenericTestUtils.assertExceptionContains(fs.getUri().getAuthority() +
+          ": Read timed out", e);
     }
   }
 
@@ -178,7 +180,8 @@ public class TestWebHdfsTimeouts {
       fs.getDelegationToken("renewer");
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
-      assertEquals(fs.getUri().getAuthority() + ": connect timed out", e.getMessage());
+      GenericTestUtils.assertExceptionContains(fs.getUri().getAuthority() +
+          ": connect timed out", e);
     }
   }
 
@@ -192,7 +195,8 @@ public class TestWebHdfsTimeouts {
       fs.getDelegationToken("renewer");
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
-      assertEquals(fs.getUri().getAuthority() + ": Read timed out", e.getMessage());
+      GenericTestUtils.assertExceptionContains(
+          fs.getUri().getAuthority() + ": Read timed out", e);
     }
   }
 
@@ -207,7 +211,8 @@ public class TestWebHdfsTimeouts {
       fs.getFileChecksum(new Path("/file"));
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
-      assertEquals(fs.getUri().getAuthority() + ": connect timed out", e.getMessage());
+      GenericTestUtils.assertExceptionContains(
+          fs.getUri().getAuthority() + ": connect timed out", e);
     }
   }
 
@@ -222,7 +227,8 @@ public class TestWebHdfsTimeouts {
       fs.getFileChecksum(new Path("/file"));
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
-      assertEquals(fs.getUri().getAuthority() + ": Read timed out", e.getMessage());
+      GenericTestUtils.assertExceptionContains(
+          fs.getUri().getAuthority() + ": Read timed out", e);
     }
   }
 
@@ -238,7 +244,8 @@ public class TestWebHdfsTimeouts {
       os = fs.create(new Path("/file"));
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
-      assertEquals(fs.getUri().getAuthority() + ": connect timed out", e.getMessage());
+      GenericTestUtils.assertExceptionContains(
+          fs.getUri().getAuthority() + ": connect timed out", e);
     } finally {
       IOUtils.cleanup(LOG, os);
     }
@@ -258,7 +265,7 @@ public class TestWebHdfsTimeouts {
       os = null;
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
-      assertEquals("Read timed out", e.getMessage());
+      GenericTestUtils.assertExceptionContains("Read timed out", e);
     } finally {
       IOUtils.cleanup(LOG, os);
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message