This is an automated email from the ASF dual-hosted git repository. sunxin pushed a commit to branch branch-2.4 in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push: new 067f609 HBASE-25773 TestSnapshotScannerHDFSAclController.setupBeforeClass is flaky (#3651) 067f609 is described below commit 067f609ec60a867fa1c19cab9747d0c9ce612f00 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 | 10 +++++----- .../security/access/TestSnapshotScannerHDFSAclController2.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 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 3cb96aa..633d2c9 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 @@ -98,7 +98,11 @@ public class TestSnapshotScannerHDFSAclController { + SnapshotScannerHDFSAclController.class.getName()); TEST_UTIL.startMiniCluster(); + 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); @@ -128,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); } @@ -143,7 +143,7 @@ public class TestSnapshotScannerHDFSAclController { private void snapshotAndWait(final String snapShotName, final TableName tableName) throws Exception{ admin.snapshot(snapShotName, tableName); - LOG.info("Sleep for one second, waiting for HDFS Acl setup"); + LOG.info("Sleep for three seconds, waiting for HDFS Acl setup"); Threads.sleep(3000); } 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 da6ac7e..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 @@ -85,7 +85,11 @@ public class TestSnapshotScannerHDFSAclController2 { + SnapshotScannerHDFSAclController.class.getName()); TEST_UTIL.startMiniCluster(); + 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); @@ -115,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); }