[hadoop] branch trunk updated: HDFS-16884. Fix TestFsDatasetImpl#testConcurrentWriteAndDeleteBlock failed (#5280)

[tomscut]

This is an automated email from the ASF dual-hosted git repository.

tomscut 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 e3b09b75123 HDFS-16884. Fix 
TestFsDatasetImpl#testConcurrentWriteAndDeleteBlock failed (#5280)
e3b09b75123 is described below

commit e3b09b751234ddd0635e6ae90280700a81a371fe
Author: huhaiyang <huhaiyang...@126.com>
AuthorDate: Wed Jan 11 09:12:26 2023 +0800

    HDFS-16884. Fix TestFsDatasetImpl#testConcurrentWriteAndDeleteBlock failed 
(#5280)
    
    Reviewed-by: Takanobu Asanuma <tasan...@apache.org>
    Signed-off-by: Tao Li <toms...@apache.org>
---
 .../hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
index 9f2425d9374..d6f42f3d020 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
@@ -662,6 +662,9 @@ public class TestFsDatasetImpl {
     for (Future<?> f : futureList) {
       f.get();
     }
+    // Wait for the async deletion task finish.
+    GenericTestUtils.waitFor(() -> 
dataset.asyncDiskService.countPendingDeletions() == 0,
+        100, 10000);
     for (String bpid : dataset.volumeMap.getBlockPoolList()) {
       assertEquals(numBlocks / 2, dataset.volumeMap.size(bpid));
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org