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

HDFS-15038. TestFsck testFsckListCorruptSnapshotFiles is failing in trunk. Contributed by hemanthboyina.

This commit is contained in:
Inigo Goiri 2020-05-14 11:26:31 -07:00
parent cf12c1349d
commit b5eb08a0d9
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
View File

@ -1034,17 +1034,7 @@ public class TestFsck {
} }
} }
// wait for the namenode to see the corruption waitForCorruptionBlocks(3, "/corruptData");
final NamenodeProtocols namenode = cluster.getNameNodeRpc();
CorruptFileBlocks corruptFileBlocks = namenode
.listCorruptFileBlocks("/corruptData", null);
int numCorrupt = corruptFileBlocks.getFiles().length;
while (numCorrupt == 0) {
Thread.sleep(1000);
corruptFileBlocks = namenode
.listCorruptFileBlocks("/corruptData", null);
numCorrupt = corruptFileBlocks.getFiles().length;
}
outStr = runFsck(conf, -1, true, "/corruptData", "-list-corruptfileblocks"); outStr = runFsck(conf, -1, true, "/corruptData", "-list-corruptfileblocks");
System.out.println("2. bad fsck out: " + outStr); System.out.println("2. bad fsck out: " + outStr);
assertTrue(outStr.contains("has 3 CORRUPT files")); assertTrue(outStr.contains("has 3 CORRUPT files"));
@ -1956,17 +1946,7 @@ public class TestFsck {
hdfs.delete(fp, false); hdfs.delete(fp, false);
numFiles--; numFiles--;
// wait for the namenode to see the corruption waitForCorruptionBlocks(numSnapshots, "/corruptData");
final NamenodeProtocols namenode = cluster.getNameNodeRpc();
CorruptFileBlocks corruptFileBlocks = namenode
.listCorruptFileBlocks("/corruptData", null);
int numCorrupt = corruptFileBlocks.getFiles().length;
while (numCorrupt == 0) {
Thread.sleep(1000);
corruptFileBlocks = namenode
.listCorruptFileBlocks("/corruptData", null);
numCorrupt = corruptFileBlocks.getFiles().length;
}
// with -includeSnapshots all files are reported // with -includeSnapshots all files are reported
outStr = runFsck(conf, -1, true, "/corruptData", outStr = runFsck(conf, -1, true, "/corruptData",
@ -1984,6 +1964,33 @@ public class TestFsck {
assertFalse(outStr.contains("/.snapshot/")); assertFalse(outStr.contains("/.snapshot/"));
} }
/**
* Wait for the namenode to see the corruption.
* @param corruptBlocks The expected number of corruptfilelocks
* @param path The Directory Path where corruptfileblocks exists
* @throws IOException
*/
private void waitForCorruptionBlocks(final int corruptBlocks,
final String path) throws Exception {
GenericTestUtils.waitFor(new Supplier<Boolean>() {
@Override
public Boolean get() {
try {
final NamenodeProtocols namenode = cluster.getNameNodeRpc();
CorruptFileBlocks corruptFileBlocks =
namenode.listCorruptFileBlocks(path, null);
int numCorrupt = corruptFileBlocks.getFiles().length;
if (numCorrupt == corruptBlocks) {
return true;
}
} catch (Exception e) {
LOG.error("Exception while getting Corrupt file blocks", e);
}
return false;
}
}, 100, 10000);
}
@Test (timeout = 300000) @Test (timeout = 300000)
public void testFsckMoveAfterCorruption() throws Exception { public void testFsckMoveAfterCorruption() throws Exception {
final int dfsBlockSize = 512 * 1024; final int dfsBlockSize = 512 * 1024;