[hbase] branch branch-2 updated: HBASE-25773 TestSnapshotScannerHDFSAclController.setupBeforeClass is flaky (#3651)

[sunxin]

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

sunxin 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 ccd9026  HBASE-25773 
TestSnapshotScannerHDFSAclController.setupBeforeClass is flaky (#3651)
ccd9026 is described below

commit ccd90269d2c0d82ae32c75d7853ec9c9ca3da66e
Author: XinSun <ddu...@gmail.com>
AuthorDate: Wed Sep 1 18:43:25 2021 +0800

    HBASE-25773 TestSnapshotScannerHDFSAclController.setupBeforeClass is flaky 
(#3651)
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    (cherry picked from commit 345d7256c812dd5fbdfe9f378b2884dd945c5da2)
---
 .../security/access/TestSnapshotScannerHDFSAclController.java | 11 ++++-------
 .../access/TestSnapshotScannerHDFSAclController2.java         | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestSnapshotScannerHDFSAclController.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestSnapshotScannerHDFSAclController.java
index 6fa80b3..e78cd36 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestSnapshotScannerHDFSAclController.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestSnapshotScannerHDFSAclController.java
@@ -44,7 +44,6 @@ import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.master.cleaner.HFileCleaner;
-import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.SecurityTests;
@@ -99,9 +98,11 @@ public class TestSnapshotScannerHDFSAclController {
           + SnapshotScannerHDFSAclController.class.getName());
 
     TEST_UTIL.startMiniCluster();
-    ProcedureTestingUtility.waitAllProcedures(
-      
TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor());
+    SnapshotScannerHDFSAclController coprocessor = 
TEST_UTIL.getHBaseCluster().getMaster()
+      
.getMasterCoprocessorHost().findCoprocessor(SnapshotScannerHDFSAclController.class);
+    TEST_UTIL.waitFor(30000, () -> coprocessor.checkInitialized("check 
initialized"));
     TEST_UTIL.waitTableAvailable(PermissionStorage.ACL_TABLE_NAME);
+
     admin = TEST_UTIL.getAdmin();
     rootDir = TEST_UTIL.getDefaultRootDirPath();
     FS = rootDir.getFileSystem(conf);
@@ -131,10 +132,6 @@ public class TestSnapshotScannerHDFSAclController {
       FS.setPermission(path, commonDirectoryPermission);
       path = path.getParent();
     }
-
-    SnapshotScannerHDFSAclController coprocessor = 
TEST_UTIL.getHBaseCluster().getMaster()
-        
.getMasterCoprocessorHost().findCoprocessor(SnapshotScannerHDFSAclController.class);
-    TEST_UTIL.waitFor(1200000, () -> coprocessor.checkInitialized("check 
initialized"));
     aclTable = 
admin.getConnection().getTable(PermissionStorage.ACL_TABLE_NAME);
   }
 
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestSnapshotScannerHDFSAclController2.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestSnapshotScannerHDFSAclController2.java
index 7ef8e3e..a6e6c95 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestSnapshotScannerHDFSAclController2.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestSnapshotScannerHDFSAclController2.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
-import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.SecurityTests;
@@ -86,9 +85,11 @@ public class TestSnapshotScannerHDFSAclController2 {
           + SnapshotScannerHDFSAclController.class.getName());
 
     TEST_UTIL.startMiniCluster();
-    ProcedureTestingUtility.waitAllProcedures(
-      
TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor());
+    SnapshotScannerHDFSAclController coprocessor = 
TEST_UTIL.getHBaseCluster().getMaster()
+      
.getMasterCoprocessorHost().findCoprocessor(SnapshotScannerHDFSAclController.class);
+    TEST_UTIL.waitFor(30000, () -> coprocessor.checkInitialized("check 
initialized"));
     TEST_UTIL.waitTableAvailable(PermissionStorage.ACL_TABLE_NAME);
+
     admin = TEST_UTIL.getAdmin();
     Path rootDir = TEST_UTIL.getDefaultRootDirPath();
     FS = rootDir.getFileSystem(conf);
@@ -118,10 +119,6 @@ public class TestSnapshotScannerHDFSAclController2 {
       FS.setPermission(path, commonDirectoryPermission);
       path = path.getParent();
     }
-
-    SnapshotScannerHDFSAclController coprocessor = 
TEST_UTIL.getHBaseCluster().getMaster()
-        
.getMasterCoprocessorHost().findCoprocessor(SnapshotScannerHDFSAclController.class);
-    TEST_UTIL.waitFor(1200000, () -> coprocessor.checkInitialized("check 
initialized"));
     aclTable = 
admin.getConnection().getTable(PermissionStorage.ACL_TABLE_NAME);
   }