Author: arp Date: Sat Mar 8 16:41:26 2014 New Revision: 1575562 URL: http://svn.apache.org/r1575562 Log: HDFS-6078. Merging r1575561 from branch-2 to branch-2.4.
Modified: hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBlockReports.java Modified: hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1575562&r1=1575561&r2=1575562&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Sat Mar 8 16:41:26 2014 @@ -318,6 +318,8 @@ Release 2.4.0 - UNRELEASED HDFS-5064. Standby checkpoints should not block concurrent readers. (atm via wang) + HDFS-6078. TestIncrementalBlockReports is flaky. (Arpit Agarwal) + BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) Modified: hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBlockReports.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBlockReports.java?rev=1575562&r1=1575561&r2=1575562&view=diff ============================================================================== --- hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBlockReports.java (original) +++ hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBlockReports.java Sat Mar 8 16:41:26 2014 @@ -20,6 +20,7 @@ package org.apache.hadoop.hdfs.server.da import static junit.framework.Assert.assertFalse; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.times; import java.io.IOException; @@ -195,7 +196,7 @@ public class TestIncrementalBlockReports Thread.sleep(2000); // Ensure that the received block is reported. - Mockito.verify(nnSpy, times(1)).blockReceivedAndDeleted( + Mockito.verify(nnSpy, atLeastOnce()).blockReceivedAndDeleted( any(DatanodeRegistration.class), anyString(), any(StorageReceivedDeletedBlocks[].class));