Author: tgraves Date: Fri Oct 5 16:01:09 2012 New Revision: 1394617 URL: http://svn.apache.org/viewvc?rev=1394617&view=rev Log: merge -r 1394609:1394610 from branch-2. FIXES: HDFS-3829
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHftpURLTimeouts.java Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1394617&r1=1394616&r2=1394617&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Oct 5 16:01:09 2012 @@ -18,6 +18,9 @@ Release 0.23.5 - UNRELEASED HDFS-3905. Secure cluster cannot use hftp to an insecure cluster (Daryn Sharp via tgraves) + HDFS-3829. TestHftpURLTimeouts fails intermittently with JDK7 (Trevor + Robinson via tgraves) + Release 0.23.4 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHftpURLTimeouts.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHftpURLTimeouts.java?rev=1394617&r1=1394616&r2=1394617&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHftpURLTimeouts.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHftpURLTimeouts.java Fri Oct 5 16:01:09 2012 @@ -54,19 +54,23 @@ public class TestHftpURLTimeouts { boolean timedout = false; HftpFileSystem fs = (HftpFileSystem)FileSystem.get(uri, conf); - HttpURLConnection conn = fs.openConnection("/", ""); - timedout = false; try { - // this will consume the only slot in the backlog - conn.getInputStream(); - } catch (SocketTimeoutException ste) { - timedout = true; - assertEquals("Read timed out", ste.getMessage()); + HttpURLConnection conn = fs.openConnection("/", ""); + timedout = false; + try { + // this will consume the only slot in the backlog + conn.getInputStream(); + } catch (SocketTimeoutException ste) { + timedout = true; + assertEquals("Read timed out", ste.getMessage()); + } finally { + if (conn != null) conn.disconnect(); + } + assertTrue("read timedout", timedout); + assertTrue("connect timedout", checkConnectTimeout(fs, false)); } finally { - if (conn != null) conn.disconnect(); + fs.close(); } - assertTrue("read timedout", timedout); - assertTrue("connect timedout", checkConnectTimeout(fs, false)); } @Test @@ -80,20 +84,24 @@ public class TestHftpURLTimeouts { boolean timedout = false; HsftpFileSystem fs = (HsftpFileSystem)FileSystem.get(uri, conf); - HttpURLConnection conn = null; - timedout = false; try { - // this will consume the only slot in the backlog - conn = fs.openConnection("/", ""); - } catch (SocketTimeoutException ste) { - // SSL expects a negotiation, so it will timeout on read, unlike hftp - timedout = true; - assertEquals("Read timed out", ste.getMessage()); + HttpURLConnection conn = null; + timedout = false; + try { + // this will consume the only slot in the backlog + conn = fs.openConnection("/", ""); + } catch (SocketTimeoutException ste) { + // SSL expects a negotiation, so it will timeout on read, unlike hftp + timedout = true; + assertEquals("Read timed out", ste.getMessage()); + } finally { + if (conn != null) conn.disconnect(); + } + assertTrue("ssl read connect timedout", timedout); + assertTrue("connect timedout", checkConnectTimeout(fs, true)); } finally { - if (conn != null) conn.disconnect(); + fs.close(); } - assertTrue("ssl read connect timedout", timedout); - assertTrue("connect timedout", checkConnectTimeout(fs, true)); } private boolean checkConnectTimeout(HftpFileSystem fs, boolean ignoreReadTimeout)