From 9ac26b80b2d2954e9655553685c2e5ccd4d8aa3e Mon Sep 17 00:00:00 2001
From: Yu Li <liyu@apache.org>
Date: Wed, 18 Jul 2018 16:02:59 +0800
Subject: [PATCH] HBASE-20907 Fix Intermittent failure on TestProcedurePriority

---
 .../hadoop/hbase/master/procedure/TestProcedurePriority.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.java
index 9f5741c929d..7386b2f05ad 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedurePriority.java
@@ -136,6 +136,8 @@ public class TestProcedurePriority {
       .stream().filter(t -> !t.getRegionServer().getRegions(TableName.META_TABLE_NAME).isEmpty())
       .findAny().get();
     HRegionServer rsNoMeta = UTIL.getOtherRegionServer(rsWithMetaThread.getRegionServer());
+    // wait for NS table initialization to avoid our error inject affecting master initialization
+    UTIL.waitTableAvailable(TableName.NAMESPACE_TABLE_NAME);
     FAIL = true;
     UTIL.getMiniHBaseCluster().killRegionServer(rsNoMeta.getServerName());
     // wait until all the worker thread are stuck, which means that the stuck checker will start to