big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-11178. TestAddStripedBlockInFBR#testAddBlockInFullBlockReport fails frequently in trunk. Contributed By Yiqun Lin.

Browse Source
This commit is contained in:
Brahma Reddy Battula 2016-12-06 22:30:43 +05:30
parent 4dd4f3a4bb
commit ed89856755
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddStripedBlockInFBR.java
View File

@ -30,9 +30,8 @@
import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager;
import org.apache.hadoop.hdfs.server.blockmanagement.NumberReplicas;
import org.apache.hadoop.hdfs.server.datanode.DataNode;
import org.apache.hadoop.hdfs.server.datanode.DataNodeTestUtils;
import org.apache.hadoop.test.GenericTestUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@ -40,6 +39,8 @@
import org.mockito.Mockito;
import org.mockito.internal.util.reflection.Whitebox;
import com.google.common.base.Supplier;
import java.io.IOException;
public class TestAddStripedBlockInFBR {
@ -98,14 +99,27 @@ public void testAddBlockInFullBlockReport() throws Exception {
DFSTestUtil.createFile(dfs, ecFile,
cellSize * dataBlocks, (short) 1, 0L);
// trigger dn's FBR. The FBR will add block-dn mapping.
DataNodeTestUtils.triggerBlockReport(dn);
GenericTestUtils.waitFor(new Supplier<Boolean>() {
// make sure NN has correct block-dn mapping
BlockInfoStriped blockInfo = (BlockInfoStriped) cluster.getNamesystem()
.getFSDirectory().getINode(ecFile.toString()).asFile().getLastBlock();
NumberReplicas nr = spy.countNodes(blockInfo);
Assert.assertEquals(groupSize, nr.liveReplicas());
Assert.assertEquals(0, nr.excessReplicas());
@Override
public Boolean get() {
try {
// trigger dn's FBR. The FBR will add block-dn mapping.
cluster.triggerBlockReports();
// make sure NN has correct block-dn mapping
BlockInfoStriped blockInfo = (BlockInfoStriped) cluster
.getNamesystem().getFSDirectory().getINode(ecFile.toString())
.asFile().getLastBlock();
NumberReplicas nr = spy.countNodes(blockInfo);
return nr.excessReplicas() == 0 && nr.liveReplicas() == groupSize;
} catch (Exception ignored) {
// Ignore the exception
}
return false;
}
}, 3000, 60000);
}
}