Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-8785. TestDistributedFileSystem is failing in trunk. Contributed by Xiaoyu Yao. 

(cherry picked from commit 2196e39e14)
This commit is contained in:
Xiaoyu Yao 2015-07-27 07:28:41 -07:00 committed by Yongjun Zhang
parent 5b1e1dfb3f
commit 08616b3654
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -1630,6 +1630,8 @@ Release 2.7.3 - UNRELEASED
HDFS-9383. TestByteArrayManager#testByteArrayManager fails. HDFS-9383. TestByteArrayManager#testByteArrayManager fails.
(szetszwo via kihwal) (szetszwo via kihwal)
HDFS-8785. TestDistributedFileSystem is failing in trunk. (Xiaoyu Yao)
Release 2.7.2 - UNRELEASED Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

13
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
View File

@ -1131,19 +1131,22 @@ public class TestDistributedFileSystem {
try { try {
cluster.waitActive(); cluster.waitActive();
DistributedFileSystem dfs = cluster.getFileSystem(); DistributedFileSystem dfs = cluster.getFileSystem();
// Write 1 MB to a dummy socket to ensure the write times out // Write 10 MB to a dummy socket to ensure the write times out
ServerSocket socket = new ServerSocket(0); ServerSocket socket = new ServerSocket(0);
Peer peer = dfs.getClient().newConnectedPeer( Peer peer = dfs.getClient().newConnectedPeer(
(InetSocketAddress) socket.getLocalSocketAddress(), null, null); (InetSocketAddress) socket.getLocalSocketAddress(), null, null);
long start = Time.now(); long start = Time.now();
try { try {
byte[] buf = new byte[1024 * 1024]; byte[] buf = new byte[10 * 1024 * 1024];
peer.getOutputStream().write(buf); peer.getOutputStream().write(buf);
Assert.fail("write should timeout"); long delta = Time.now() - start;
Assert.fail("write finish in " + delta + " ms" + "but should timedout");
} catch (SocketTimeoutException ste) { } catch (SocketTimeoutException ste) {
long delta = Time.now() - start; long delta = Time.now() - start;
Assert.assertTrue("write timedout too soon", delta >= timeout * 0.9); Assert.assertTrue("write timedout too soon in " + delta + " ms",
Assert.assertTrue("write timedout too late", delta <= timeout * 1.1); delta >= timeout * 0.9);
Assert.assertTrue("write timedout too late in " + delta + " ms",
delta <= timeout * 1.2);
} catch (Throwable t) { } catch (Throwable t) {
Assert.fail("wrong exception:" + t); Assert.fail("wrong exception:" + t);
} }