HDFS-15297. TestNNHandlesBlockReportPerStorage::blockReport_02 fails intermittently. Contributed by Ayush Saxena

liuml07 · liuml07 · commit 74d4a18735d2 · 2020-04-25T15:43:02.000-07:00
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/BlockReportTestBase.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/BlockReportTestBase.java
@@ -37,7 +37,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.slf4j.Logger;
@@ -320,7 +319,7 @@ public void blockReport_02() throws IOException {
       }
     }
 
-    waitTil(TimeUnit.SECONDS.toMillis(DN_RESCAN_EXTRA_WAIT));
+    DataNodeTestUtils.runDirectoryScanner(dn0);
 
     // all blocks belong to the same file, hence same BP
     String poolId = cluster.getNamesystem().getBlockPoolId();

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@`
`37`	`37`	`import java.util.concurrent.ExecutorService;`
`38`	`38`	`import java.util.concurrent.Executors;`
`39`	`39`	`import java.util.concurrent.Future;`
`40`		`-import java.util.concurrent.TimeUnit;`
`41`	`40`	`import java.util.concurrent.TimeoutException;`
`42`	`41`
`43`	`42`	`import org.slf4j.Logger;`
`@@ -320,7 +319,7 @@ public void blockReport_02() throws IOException {`
`320`	`319`	`}`
`321`	`320`	`}`
`322`	`321`
`323`		`- waitTil(TimeUnit.SECONDS.toMillis(DN_RESCAN_EXTRA_WAIT));`
	`322`	`+ DataNodeTestUtils.runDirectoryScanner(dn0);`
`324`	`323`
`325`	`324`	`// all blocks belong to the same file, hence same BP`
`326`	`325`	`String poolId = cluster.getNamesystem().getBlockPoolId();`