Repository: hbase Updated Branches: refs/heads/branch-1.4 8e62eb22e -> de7b28419
Revert "HBASE-19752 RSGroupBasedLoadBalancer#getMisplacedRegions() should handle the case where rs group cannot be determined" This reverts commit 8e62eb22e974790d47056a41aa54f6dd009756ea. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/de7b2841 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/de7b2841 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/de7b2841 Branch: refs/heads/branch-1.4 Commit: de7b2841971492b3c0710c81d3811d123b8ee9fd Parents: 8e62eb2 Author: Andrew Purtell <[email protected]> Authored: Fri Jan 12 15:28:24 2018 -0800 Committer: Andrew Purtell <[email protected]> Committed: Fri Jan 12 15:28:24 2018 -0800 ---------------------------------------------------------------------- .../hbase/rsgroup/RSGroupBasedLoadBalancer.java | 13 ++++--------- .../balancer/TestRSGroupBasedLoadBalancer.java | 17 ----------------- 2 files changed, 4 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/de7b2841/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java ---------------------------------------------------------------------- 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 b627c42..049e723 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 @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.rsgroup; -import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; @@ -312,7 +311,6 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc return finalList; } - @VisibleForTesting private Set<HRegionInfo> getMisplacedRegions( Map<HRegionInfo, ServerName> regions) throws IOException { Set<HRegionInfo> misplacedRegions = new HashSet<HRegionInfo>(); @@ -321,15 +319,12 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc ServerName assignedServer = region.getValue(); RSGroupInfo info = infoManager.getRSGroup(infoManager.getRSGroupOfTable(regionInfo.getTable())); - RSGroupInfo otherInfo = infoManager.getRSGroupOfServer(assignedServer.getAddress()); - if (info == null && otherInfo == null) { - LOG.warn("Couldn't obtain rs group information for " + region + " on " + assignedServer); - continue; - } - if ((info == null || !info.containsServer(assignedServer.getAddress()))) { + if (assignedServer != null && + (info == null || !info.containsServer(assignedServer.getAddress()))) { LOG.debug("Found misplaced region: " + regionInfo.getRegionNameAsString() + " on server: " + assignedServer + - " found in group: " + otherInfo + + " found in group: " + + infoManager.getRSGroupOfServer(assignedServer.getAddress()) + " outside of group: " + (info == null ? "UNKNOWN" : info.getName())); misplacedRegions.add(regionInfo); } http://git-wip-us.apache.org/repos/asf/hbase/blob/de7b2841/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.java ---------------------------------------------------------------------- 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 359a873..2360ce8 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 @@ -78,7 +78,6 @@ 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"), @@ -223,20 +222,6 @@ public class TestRSGroupBasedLoadBalancer { assertRetainedAssignment(inputForTest, servers, newAssignment); } - @Test - public void testGetMisplacedRegions() throws Exception { - // Test case where region is not considered misplaced if RSGroupInfo cannot be determined - Map<RegionInfo, ServerName> 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<RegionInfo> misplacedRegions = loadBalancer.getMisplacedRegions(inputForTest); - assertFalse(misplacedRegions.contains(ri)); - } /** * Test BOGUS_SERVER_NAME among groups do not overwrite each other * @throws Exception @@ -535,8 +520,6 @@ public class TestRSGroupBasedLoadBalancer { tableMap.put(tables[i], groupName); tds.add(htd); } - tableMap.put(table0, ""); - tds.add(new HTableDescriptor(table0)); return tds; }
