HDFS-4998. TestUnderReplicatedBlocks fails intermittently. Contributed by Kihwal Lee.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1503971 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2013-07-17 01:57:35 +00:00
parent 3520039979
commit d26334b410
2 changed files with 4 additions and 2 deletions

View File

@ -3264,6 +3264,8 @@ Release 0.23.10 - UNRELEASED
BUG FIXES
HDFS-4998. TestUnderReplicatedBlocks fails intermittently (kihwal)
Release 0.23.9 - 2013-07-08
INCOMPATIBLE CHANGES

View File

@ -31,7 +31,7 @@ import org.apache.hadoop.hdfs.server.datanode.DataNodeTestUtils;
import org.junit.Test;
public class TestUnderReplicatedBlocks {
@Test(timeout=300000) // 5 min timeout
@Test(timeout=60000) // 1 min timeout
public void testSetrepIncWithUnderReplicatedBlocks() throws Exception {
Configuration conf = new HdfsConfiguration();
final short REPLICATION_FACTOR = 2;
@ -54,7 +54,7 @@ public class TestUnderReplicatedBlocks {
BlockManagerTestUtil.computeAllPendingWork(bm);
DataNodeTestUtils.triggerHeartbeat(cluster.getDataNode(dn.getIpcPort()));
// Wait to make sure the DataNode receives the deletion request
Thread.sleep(1000);
Thread.sleep(5000);
// Remove the record from blocksMap
bm.blocksMap.removeNode(b.getLocalBlock(), dn);