Repository: hbase Updated Branches: refs/heads/branch-1 36178f744 -> 68c939668 refs/heads/branch-1.3 6f53424f8 -> 6618a40ff refs/heads/branch-1.4 4d81cfe7e -> 58e4731ac refs/heads/branch-2 dcdebbffd -> 7c5e20022 refs/heads/branch-2.0 6214e7801 -> 6584a76d3 refs/heads/branch-2.1 3a13088a2 -> 0875fa063 refs/heads/master d9f32137b -> c4b231570
Amend HBASE-21439 RegionLoads aren't being used in RegionLoad cost functions Addendum: Update RSGroup Test too Signed-off-by: Andrew Purtell <apurt...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c4b23157 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c4b23157 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c4b23157 Branch: refs/heads/master Commit: c4b231570699954eb8bcaf1f5030cfa7939303dc Parents: d9f3213 Author: Ben Lau <ben...@oath.com> Authored: Thu Nov 8 13:20:19 2018 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Thu Nov 8 14:07:50 2018 -0800 ---------------------------------------------------------------------- ...GroupBasedLoadBalancerWithStochasticLoadBalancerAsInternal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c4b23157/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancerWithStochasticLoadBalancerAsInternal.java ---------------------------------------------------------------------- diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancerWithStochasticLoadBalancerAsInternal.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancerWithStochasticLoadBalancerAsInternal.java index a63b7c7..723a295 100644 --- a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancerWithStochasticLoadBalancerAsInternal.java +++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancerWithStochasticLoadBalancerAsInternal.java @@ -89,7 +89,7 @@ public class TestRSGroupBasedLoadBalancerWithStochasticLoadBalancerAsInternal when(rl.getWriteRequestCount()).thenReturn(0L); when(rl.getMemStoreSize()).thenReturn(Size.ZERO); when(rl.getStoreFileSize()).thenReturn(Size.ZERO); - regionLoadMap.put(info.getEncodedNameAsBytes(), rl); + regionLoadMap.put(info.getRegionName(), rl); } when(serverMetrics.getRegionMetrics()).thenReturn(regionLoadMap); return serverMetrics;