commit e424c239254532696e969ca8085b465023d102cf Author: Yu Li Date: Wed Jul 18 16:02:59 2018 +0800 HBASE-20907 Fix Intermittent failure on TestProcedurePriority 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 9f5741c..8702cc8 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,11 @@ public class TestProcedurePriority { .stream().filter(t -> !t.getRegionServer().getRegions(TableName.META_TABLE_NAME).isEmpty()) .findAny().get(); HRegionServer rsNoMeta = UTIL.getOtherRegionServer(rsWithMetaThread.getRegionServer()); + while (!UTIL.getMiniHBaseCluster().getMaster().getClusterSchema().getTableNamespaceManager() + .isTableAvailableAndInitialized()) { + // wait for NS table initialization to avoid our error inject affecting master initialization + Thread.sleep(200); + } FAIL = true; UTIL.getMiniHBaseCluster().killRegionServer(rsNoMeta.getServerName()); // wait until all the worker thread are stuck, which means that the stuck checker will start to