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

svn merge -c 1586039 from trunk for HDFS-6204. Fix TestRBWBlockInvalidation: change the last sleep to a loop. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586040 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2014-04-09 17:02:12 +00:00
parent f23be52c30
commit 56d87fb514
2 changed files with 11 additions and 9 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

@ -102,6 +102,9 @@ Release 2.4.1 - UNRELEASED
HDFS-6206. Fix NullPointerException in DFSUtil.substituteForWildcardAddress. HDFS-6206. Fix NullPointerException in DFSUtil.substituteForWildcardAddress.
(szetszwo) (szetszwo)
HDFS-6204. Fix TestRBWBlockInvalidation: change the last sleep to a loop.
(szetszwo)
Release 2.4.0 - 2014-04-07 Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

17
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestRBWBlockInvalidation.java
View File

@ -126,16 +126,15 @@ public class TestRBWBlockInvalidation {
} }
Thread.sleep(100); Thread.sleep(100);
} }
assertEquals("There should be two live replicas", 2, assertEquals("There should be two live replicas", 2, liveReplicas);
liveReplicas);
// sleep for 2 seconds, so that by this time datanode reports the corrupt while (true) {
// block after a live replica of block got replicated. Thread.sleep(100);
Thread.sleep(2000); if (countReplicas(namesystem, blk).corruptReplicas() == 0) {
LOG.info("Corrupt Replicas becomes 0");
// Check that there is no corrupt block in the corruptReplicasMap. break;
assertEquals("There should not be any replica in the corruptReplicasMap", }
0, countReplicas(namesystem, blk).corruptReplicas()); }
} finally { } finally {
if (out != null) { if (out != null) {
out.close(); out.close();