This is an automated email from the ASF dual-hosted git repository.
liuml07 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 74d4a18 HDFS-15297.
TestNNHandlesBlockReportPerStorage::blockReport_02 fails intermittently.
Contributed by Ayush Saxena
74d4a18 is described below
commit 74d4a18735d2b54bdaddce0c51f8e173328fc014
Author: Mingliang Liu <[email protected]>
AuthorDate: Sat Apr 25 15:42:57 2020 -0700
HDFS-15297. TestNNHandlesBlockReportPerStorage::blockReport_02 fails
intermittently. Contributed by Ayush Saxena
---
.../org/apache/hadoop/hdfs/server/datanode/BlockReportTestBase.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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
index e06be41..f500ae0 100644
---
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.ExecutionException;
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 abstract class BlockReportTestBase {
}
}
- 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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
