diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java index 1c709256558..619de9e8d93 100644 --- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java +++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java @@ -300,7 +300,8 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer { return finalList; } - private Set getMisplacedRegions( + @VisibleForTesting + public Set getMisplacedRegions( Map regions) throws IOException { Set misplacedRegions = new HashSet<>(); for(Map.Entry region : regions.entrySet()) { @@ -308,10 +309,16 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer { ServerName assignedServer = region.getValue(); RSGroupInfo info = rsGroupInfoManager.getRSGroup(rsGroupInfoManager. getRSGroupOfTable(regionInfo.getTable())); - if (assignedServer != null && - (info == null || !info.containsServer(assignedServer.getAddress()))) { - RSGroupInfo otherInfo = null; - otherInfo = rsGroupInfoManager.getRSGroupOfServer(assignedServer.getAddress()); + if (assignedServer == null) { + LOG.debug("There is no assigned server for {}", region); + continue; + } + RSGroupInfo otherInfo = rsGroupInfoManager.getRSGroupOfServer(assignedServer.getAddress()); + if (info == null && otherInfo == null) { + LOG.warn("Couldn't obtain rs group information for {} on {}", region, assignedServer); + continue; + } + if ((info == null || !info.containsServer(assignedServer.getAddress()))) { LOG.debug("Found misplaced region: " + regionInfo.getRegionNameAsString() + " on server: " + assignedServer + " found in group: " + otherInfo + diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.java index e2344383df1..68845d73e83 100644 --- a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.java +++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.java @@ -76,6 +76,7 @@ public class TestRSGroupBasedLoadBalancer { static String[] groups = new String[] { RSGroupInfo.DEFAULT_GROUP, "dg2", "dg3", "dg4" }; + static TableName table0 = TableName.valueOf("dt0"); static TableName[] tables = new TableName[] { TableName.valueOf("dt1"), TableName.valueOf("dt2"), @@ -225,6 +226,20 @@ public class TestRSGroupBasedLoadBalancer { assertClusterAsBalanced(loadMap); } + @Test + public void testGetMisplacedRegions() throws Exception { + // Test case where region is not considered misplaced if RSGroupInfo cannot be determined + Map inputForTest = new HashMap<>(); + RegionInfo ri = RegionInfoBuilder.newBuilder(table0) + .setStartKey(new byte[16]) + .setEndKey(new byte[16]) + .setSplit(false) + .setRegionId(regionId++) + .build(); + inputForTest.put(ri, servers.iterator().next()); + Set misplacedRegions = loadBalancer.getMisplacedRegions(inputForTest); + assertFalse(misplacedRegions.contains(ri)); + } /** * Test the cluster startup bulk assignment which attempts to retain * assignment info. @@ -552,6 +567,8 @@ public class TestRSGroupBasedLoadBalancer { tableMap.put(tables[i], groupName); tds.add(htd); } + tableMap.put(table0, ""); + tds.add(new HTableDescriptor(table0)); return tds; }