From f40f8416fe66ffd131eef58f0e8cc7c00e6d5bbd Mon Sep 17 00:00:00 2001 From: Mingliang Liu Date: Fri, 24 Aug 2018 13:26:22 -0700 Subject: [PATCH] HBASE-21100 HBTU.waitUntilAllRegionsAssigned will count split/merged region and cause wait timeout --- .../java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index b938d2834f..43dcd20420 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -3337,8 +3337,9 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility { return false; } } - if (RegionStateStore.getRegionState(r, - info.getReplicaId()) != RegionState.State.OPEN) { + RegionState.State state = RegionStateStore.getRegionState(r, info.getReplicaId()); + if (!(state == RegionState.State.SPLIT || state == RegionState.State.MERGED || + state == RegionState.State.OPEN)) { return false; } } -- 2.18.0