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

HDFS-7130. TestDataTransferKeepalive fails intermittently on Windows. Contributed by Chris Nauroth.

This commit is contained in:
cnauroth 2014-09-23 14:35:33 -07:00
parent f48686a1ad
commit b93d9603a2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -932,6 +932,9 @@ Release 2.6.0 - UNRELEASED
HDFS-7115. TestEncryptionZonesWithHA assumes Unix path separator for KMS key HDFS-7115. TestEncryptionZonesWithHA assumes Unix path separator for KMS key
store path. (Xiaoyu Yao via cnauroth) store path. (Xiaoyu Yao via cnauroth)
HDFS-7130. TestDataTransferKeepalive fails intermittently on Windows.
(cnauroth)
Release 2.5.1 - 2014-09-05 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferKeepalive.java
View File

@ -105,7 +105,7 @@ public class TestDataTransferKeepalive {
// Sleep for a bit longer than the keepalive timeout // Sleep for a bit longer than the keepalive timeout
// and make sure the xceiver died. // and make sure the xceiver died.
Thread.sleep(DFS_DATANODE_SOCKET_REUSE_KEEPALIVE_DEFAULT + 1); Thread.sleep(DFS_DATANODE_SOCKET_REUSE_KEEPALIVE_DEFAULT + 50);
assertXceiverCount(0); assertXceiverCount(0);
// The socket is still in the cache, because we don't // The socket is still in the cache, because we don't
@ -149,7 +149,7 @@ public class TestDataTransferKeepalive {
assertXceiverCount(1); assertXceiverCount(1);
// Sleep for a bit longer than the client keepalive timeout. // Sleep for a bit longer than the client keepalive timeout.
Thread.sleep(CLIENT_EXPIRY_MS + 1); Thread.sleep(CLIENT_EXPIRY_MS + 50);
// Taking out a peer which is expired should give a null. // Taking out a peer which is expired should give a null.
Peer peer = peerCache.get(dn.getDatanodeId(), false); Peer peer = peerCache.get(dn.getDatanodeId(), false);