You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ha...@apache.org on 2021/05/22 14:21:12 UTC
[hbase] branch branch-2 updated: HBASE-25773
TestSnapshotScannerHDFSAclController.setupBeforeClass is flaky (#3160)
This is an automated email from the ASF dual-hosted git repository.
haxiaolin 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 16f865f HBASE-25773 TestSnapshotScannerHDFSAclController.setupBeforeClass is flaky (#3160)
16f865f is described below
commit 16f865f65d50f71d69534790a371a311cd740b53
Author: Xiaolin Ha <ha...@apache.org>
AuthorDate: Sat May 22 21:56:17 2021 +0800
HBASE-25773 TestSnapshotScannerHDFSAclController.setupBeforeClass is flaky (#3160)
Signed-off-by: Duo Zhang <zh...@apache.org>
---
.../hbase/security/access/TestSnapshotScannerHDFSAclController.java | 3 +++
.../hbase/security/access/TestSnapshotScannerHDFSAclController2.java | 3 +++
2 files changed, 6 insertions(+)
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..6fa80b3 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,6 +44,7 @@ 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;
@@ -98,6 +99,8 @@ public class TestSnapshotScannerHDFSAclController {
+ SnapshotScannerHDFSAclController.class.getName());
TEST_UTIL.startMiniCluster();
+ ProcedureTestingUtility.waitAllProcedures(
+ TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor());
TEST_UTIL.waitTableAvailable(PermissionStorage.ACL_TABLE_NAME);
admin = TEST_UTIL.getAdmin();
rootDir = TEST_UTIL.getDefaultRootDirPath();
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..7ef8e3e 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,6 +32,7 @@ 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;
@@ -85,6 +86,8 @@ public class TestSnapshotScannerHDFSAclController2 {
+ SnapshotScannerHDFSAclController.class.getName());
TEST_UTIL.startMiniCluster();
+ ProcedureTestingUtility.waitAllProcedures(
+ TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor());
TEST_UTIL.waitTableAvailable(PermissionStorage.ACL_TABLE_NAME);
admin = TEST_UTIL.getAdmin();
Path rootDir = TEST_UTIL.getDefaultRootDirPath();