Repository: hbase Updated Branches: refs/heads/branch-1.3 2ebd80499 -> c799649a0
Revert "Fix bookkeeping error with max regions for a table" This reverts commit 2ebd80499473bbac3eac083806211ec03e084db7. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ad885a0b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ad885a0b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ad885a0b Branch: refs/heads/branch-1.3 Commit: ad885a0baae21b943ffebef168c65650f8317023 Parents: 2ebd804 Author: Chia-Ping Tsai <chia7...@gmail.com> Authored: Tue Aug 1 00:19:07 2017 +0800 Committer: Chia-Ping Tsai <chia7...@gmail.com> Committed: Tue Aug 1 00:19:07 2017 +0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java | 2 +- .../apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ad885a0b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java index de98f71..0ec1e39 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java @@ -661,7 +661,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer { //check whether this caused maxRegionsPerTable in the new Server to be updated if (numRegionsPerServerPerTable[newServer][tableIndex] > numMaxRegionsPerTable[tableIndex]) { - numMaxRegionsPerTable[tableIndex] = numRegionsPerServerPerTable[newServer][tableIndex]; + numRegionsPerServerPerTable[newServer][tableIndex] = numMaxRegionsPerTable[tableIndex]; } else if (oldServer >= 0 && (numRegionsPerServerPerTable[oldServer][tableIndex] + 1) == numMaxRegionsPerTable[tableIndex]) { //recompute maxRegionsPerTable since the previous value was coming from the old server http://git-wip-us.apache.org/repos/asf/hbase/blob/ad885a0b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java index 3b2138e..be63d91 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java @@ -326,8 +326,6 @@ public class TestBaseLoadBalancer extends BalancerTestBase { // now move region1 from servers[0] to servers[2] cluster.doAction(new MoveRegionAction(0, 0, 2)); - // check that the numMaxRegionsPerTable for "table" has increased to 2 - assertEquals(2, cluster.numMaxRegionsPerTable[0]); // now repeat check whether moving region1 from servers[1] to servers[2] // would lower availability assertTrue(cluster.wouldLowerAvailability(hri1, servers[2]));
