HDFS-14303. Addendum: check block directory logic not correct when there is only meta file, print no meaning warn log. Contributed by qiang Liu.

This commit is contained in:
Ayush Saxena 2019-07-26 08:22:22 +05:30
parent a2cc961086
commit ce99cc31e9
1 changed files with 3 additions and 2 deletions

View File

@ -1117,8 +1117,9 @@ public class TestDirectoryScanner {
@Test @Test
public void testDirectoryScannerInFederatedCluster() throws Exception { public void testDirectoryScannerInFederatedCluster() throws Exception {
HdfsConfiguration conf = new HdfsConfiguration(CONF);
// Create Federated cluster with two nameservices and one DN // Create Federated cluster with two nameservices and one DN
try (MiniDFSCluster cluster = new MiniDFSCluster.Builder(CONF) try (MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
.nnTopology(MiniDFSNNTopology.simpleHAFederatedTopology(2)) .nnTopology(MiniDFSNNTopology.simpleHAFederatedTopology(2))
.numDataNodes(1).build()) { .numDataNodes(1).build()) {
cluster.waitActive(); cluster.waitActive();
@ -1134,7 +1135,7 @@ public class TestDirectoryScanner {
int bp2Files = 2; int bp2Files = 2;
writeFile(fs2, bp2Files); writeFile(fs2, bp2Files);
// Call the Directory scanner // Call the Directory scanner
scanner = new DirectoryScanner(fds, CONF); scanner = new DirectoryScanner(fds, conf);
scanner.setRetainDiffs(true); scanner.setRetainDiffs(true);
scanner.reconcile(); scanner.reconcile();
// Check blocks in corresponding BP // Check blocks in corresponding BP