You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ay...@apache.org on 2019/09/14 04:43:48 UTC
[hadoop] branch branch-3.2 updated: 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 is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 4126e67 HDFS-14303. Addendum: check block directory logic not correct when there is only meta file, print no meaning warn log. Contributed by qiang Liu.
4126e67 is described below
commit 4126e67e31d9431477aa39903bb03c0350f9c389
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Sat Sep 14 10:12:17 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 438119a..13ae85e 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
@@ -1132,8 +1132,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();
@@ -1150,7 +1151,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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org