[hbase] branch branch-2 updated: HBASE-23079 Addendum fix broken UT

[zhangduo]

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

zhangduo 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 1a2d47b  HBASE-23079 Addendum fix broken UT
1a2d47b is described below

commit 1a2d47b6c7f78ecd75bf089552ec2f4994ef8b6f
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Mon Sep 30 15:46:46 2019 +0800

    HBASE-23079 Addendum fix broken UT
---
 .../master/assignment/TestOpenRegionProcedureBackoff.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestOpenRegionProcedureBackoff.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestOpenRegionProcedureBackoff.java
index 69ad093..9f5b6fc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestOpenRegionProcedureBackoff.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestOpenRegionProcedureBackoff.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.client.AsyncAdmin;
 import org.apache.hadoop.hbase.client.AsyncConnection;
 import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
 import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.RegionLocator;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.master.HMaster;
 import org.apache.hadoop.hbase.master.MasterServices;
@@ -94,7 +95,14 @@ public class TestOpenRegionProcedureBackoff {
     Configuration conf = UTIL.getConfiguration();
     conf.setClass(HConstants.MASTER_IMPL, HMasterForTest.class, HMaster.class);
     UTIL.startMiniCluster(1);
-    UTIL.waitTableAvailable(TableName.META_TABLE_NAME);
+    UTIL.waitFor(10000, () -> {
+      try (
+        RegionLocator locator = 
UTIL.getConnection().getRegionLocator(TableName.META_TABLE_NAME)) {
+        return locator.getRegionLocation(HConstants.EMPTY_START_ROW) != null;
+      } catch (Exception e) {
+        return false;
+      }
+    });
   }
 
   @AfterClass