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

HDFS-11122. TestDFSAdmin#testReportCommand fails due to timed out. Contributed by Yiqun Lin

This commit is contained in:
Mingliang Liu 2016-11-11 12:29:47 -08:00
parent 5c61ad2488
commit aa6010ccca
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
View File

@ -31,6 +31,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.ReconfigurationUtil; import org.apache.hadoop.conf.ReconfigurationUtil;
import org.apache.hadoop.fs.ChecksumException;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.DFSClient; import org.apache.hadoop.hdfs.DFSClient;
@ -46,6 +47,7 @@ import org.apache.hadoop.hdfs.server.common.Storage;
import org.apache.hadoop.hdfs.server.datanode.DataNode; import org.apache.hadoop.hdfs.server.datanode.DataNode;
import org.apache.hadoop.hdfs.server.datanode.StorageLocation; import org.apache.hadoop.hdfs.server.datanode.StorageLocation;
import org.apache.hadoop.hdfs.server.namenode.NameNode; import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.test.PathUtils; import org.apache.hadoop.test.PathUtils;
import org.apache.hadoop.util.ToolRunner; import org.apache.hadoop.util.ToolRunner;
@ -69,6 +71,7 @@ import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.containsString;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@ -472,7 +475,7 @@ public class TestDFSAdmin {
return sb.toString(); return sb.toString();
} }
@Test(timeout = 30000) @Test(timeout = 120000)
public void testReportCommand() throws Exception { public void testReportCommand() throws Exception {
redirectStream(); redirectStream();
@ -530,6 +533,14 @@ public class TestDFSAdmin {
assertEquals("Fail to corrupt all replicas for block " + block, assertEquals("Fail to corrupt all replicas for block " + block,
replFactor, blockFilesCorrupted); replFactor, blockFilesCorrupted);
try {
IOUtils.copyBytes(fs.open(file), new IOUtils.NullOutputStream(),
conf, true);
fail("Should have failed to read the file with corrupted blocks.");
} catch (ChecksumException ignored) {
// expected exception reading corrupt blocks
}
/* /*
* Increase replication factor, this should invoke transfer request. * Increase replication factor, this should invoke transfer request.
* Receiving datanode fails on checksum and reports it to namenode * Receiving datanode fails on checksum and reports it to namenode
@ -542,6 +553,7 @@ public class TestDFSAdmin {
public Boolean get() { public Boolean get() {
LocatedBlocks blocks = null; LocatedBlocks blocks = null;
try { try {
miniCluster.triggerBlockReports();
blocks = client.getNamenode().getBlockLocations(file.toString(), 0, blocks = client.getNamenode().getBlockLocations(file.toString(), 0,
Long.MAX_VALUE); Long.MAX_VALUE);
} catch (IOException e) { } catch (IOException e) {
@ -549,7 +561,7 @@ public class TestDFSAdmin {
} }
return blocks != null && blocks.get(0).isCorrupt(); return blocks != null && blocks.get(0).isCorrupt();
} }
}, 100, 60000); }, 1000, 60000);
BlockManagerTestUtil.updateState( BlockManagerTestUtil.updateState(
miniCluster.getNameNode().getNamesystem().getBlockManager()); miniCluster.getNameNode().getNamesystem().getBlockManager());