This is an automated email from the ASF dual-hosted git repository. ayushsaxena pushed a commit to branch branch-2.9 in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.9 by this push: new 5b4e9a5 HDFS-14303. Addendum: check block directory logic not correct when there is only meta file, print no meaning warn log. Contributed by qiang Liu. 5b4e9a5 is described below commit 5b4e9a5dc4b2e108a8eadbdca8e42ba772bfe46e Author: Ayush Saxena <ayushsax...@apache.org> AuthorDate: Sat Sep 14 10:30:46 2019 +0530 HDFS-14303. Addendum: check block directory logic not correct when there is only meta file, print no meaning warn log. Contributed by qiang Liu. --- .../org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java index d4ff643..f4bf60a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java @@ -1092,8 +1092,9 @@ public class TestDirectoryScanner { @Test public void testDirectoryScannerInFederatedCluster() throws Exception { + HdfsConfiguration conf = new HdfsConfiguration(CONF); //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)) .numDataNodes(1).build()) { cluster.waitActive(); @@ -1110,7 +1111,7 @@ public class TestDirectoryScanner { int bp2Files = 2; writeFile(fs2, bp2Files); //Call the Directory scanner - scanner = new DirectoryScanner(dataNode, fds, CONF); + scanner = new DirectoryScanner(dataNode, fds, conf); scanner.setRetainDiffs(true); scanner.reconcile(); //Check blocks in corresponding BP --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org