hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From psomo...@apache.org
Subject [hbase] branch branch-2 updated: HBASE-23009 TestSnapshotScannerHDFSAclController is broken on branch-2
Date Wed, 11 Sep 2019 13:34:22 GMT
This is an automated email from the ASF dual-hosted git repository.

psomogyi pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 516e921  HBASE-23009 TestSnapshotScannerHDFSAclController is broken on branch-2
516e921 is described below

commit 516e921cc0e60dd40c40e02f5a7a0a66823ae072
Author: meiyi <myimeiyi@gmail.com>
AuthorDate: Wed Sep 11 11:16:53 2019 +0800

    HBASE-23009 TestSnapshotScannerHDFSAclController is broken on branch-2
---
 .../main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
index b4f1f9b..2098b2c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
@@ -429,7 +429,7 @@ public abstract class CleanerChore<T extends FileCleanerDelegate>
extends Schedu
           }
           try {
             boolean allSubDirsDeleted = futures.stream().allMatch(CompletableFuture::join);
-            boolean deleted = allFilesDeleted && allSubDirsDeleted;
+            boolean deleted = allFilesDeleted && allSubDirsDeleted && isEmptyDirDeletable(dir);
             if (deleted && !root) {
               // If and only if files and sub-dirs under current dir are deleted successfully,
and
               // the empty directory can be deleted, and it is not the root dir then task
will


Mime
View raw message