From ab31f2fddc3358c6cd227b86ea368d0d82e0c8c8 Mon Sep 17 00:00:00 2001 From: Kahlil Oppenheimer Date: Tue, 28 Feb 2017 00:33:57 -0500 Subject: [PATCH] Fixed old table skew measure --- .../hbase/master/balancer/BaseLoadBalancer.java | 20 ++++++--------- .../master/balancer/StochasticLoadBalancer.java | 25 ++++++++++--------- .../balancer/TestStochasticLoadBalancer.java | 29 ++++++++++++++++++++++ 3 files changed, 50 insertions(+), 24 deletions(-) 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 f27feb3..19df846 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 @@ -665,18 +665,14 @@ public abstract class BaseLoadBalancer implements LoadBalancer { } numRegionsPerServerPerTable[newServer][tableIndex]++; - //check whether this caused maxRegionsPerTable in the new Server to be updated - if (numRegionsPerServerPerTable[newServer][tableIndex] > numMaxRegionsPerTable[tableIndex]) { - numMaxRegionsPerTable[tableIndex] = numRegionsPerServerPerTable[newServer][tableIndex]; - } else if (oldServer >= 0 && (numRegionsPerServerPerTable[oldServer][tableIndex] + 1) - == numMaxRegionsPerTable[tableIndex]) { - //recompute maxRegionsPerTable since the previous value was coming from the old server - for (int serverIndex = 0 ; serverIndex < numRegionsPerServerPerTable.length; serverIndex++) { - if (numRegionsPerServerPerTable[serverIndex][tableIndex] > numMaxRegionsPerTable[tableIndex]) { - numMaxRegionsPerTable[tableIndex] = numRegionsPerServerPerTable[serverIndex][tableIndex]; - } - } - } + // if old server had max num regions, assume (for now) max num regions went down since we moved the region + if (oldServer >= 0 && + (numRegionsPerServerPerTable[oldServer][tableIndex] + 1) == numMaxRegionsPerTable[tableIndex]) { + numMaxRegionsPerTable[tableIndex]--; + } + // Now check if new server sets new max + numMaxRegionsPerTable[tableIndex] = + Math.max(numMaxRegionsPerTable[tableIndex], numRegionsPerServerPerTable[newServer][tableIndex]); // update for servers int primary = regionIndexToPrimaryIndex[region]; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java index 8825637..f4772aa 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java @@ -264,18 +264,6 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { @Override protected boolean needsBalance(Cluster cluster) { - ClusterLoadState cs = new ClusterLoadState(cluster.clusterState); - if (cs.getNumServers() < MIN_SERVER_BALANCE) { - if (LOG.isDebugEnabled()) { - LOG.debug("Not running balancer because only " + cs.getNumServers() - + " active regionserver(s)"); - } - return false; - } - if (areSomeRegionReplicasColocated(cluster)) { - return true; - } - double total = 0.0; float sumMultiplier = 0.0f; for (CostFunction c : costFunctions) { @@ -298,6 +286,19 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { + minCostNeedBalance); return false; } + + ClusterLoadState cs = new ClusterLoadState(cluster.clusterState); + if (cs.getNumServers() < MIN_SERVER_BALANCE) { + if (LOG.isDebugEnabled()) { + LOG.debug("Not running balancer because only " + cs.getNumServers() + + " active regionserver(s)"); + } + return false; + } + if (areSomeRegionReplicasColocated(cluster)) { + return true; + } + return true; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java index 614d2fb..0a11dc9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java @@ -48,6 +48,8 @@ import org.apache.hadoop.hbase.master.MockNoopMasterServices; import org.apache.hadoop.hbase.master.RackManager; import org.apache.hadoop.hbase.master.RegionPlan; import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster; +import org.apache.hadoop.hbase.master.balancer.StochasticLoadBalancer.CandidateGenerator; +import org.apache.hadoop.hbase.master.balancer.StochasticLoadBalancer.LoadCandidateGenerator; import org.apache.hadoop.hbase.testclassification.FlakeyTests; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; @@ -232,6 +234,33 @@ public class TestStochasticLoadBalancer extends BalancerTestBase { } @Test + public void testTableSkewCostProperlyDecreases() { + int replication = 1; + Configuration conf = HBaseConfiguration.create(); + StochasticLoadBalancer.CostFunction + costFunction = new StochasticLoadBalancer.TableSkewCostFunction(conf); + CandidateGenerator generator = new LoadCandidateGenerator(); + // Start out with 100 regions on one server and 0 regions on the other + int numNodes = 2; + int numTables = 1; + int numRegions = 100; + int numRegionsPerServer = 0; + + Map> serverMap = createServerMap(numNodes, numRegions, numRegionsPerServer, replication, numTables); + BaseLoadBalancer.Cluster cluster = new Cluster(serverMap, null, null, null); + costFunction.init(cluster); + double cost = costFunction.cost(); + assertEquals(1.0, cost, .0001); + for (int i = 0; i < 50; i++) { + Cluster.Action action = generator.generate(cluster); + cluster.doAction(action); + costFunction.postAction(action); + cost = costFunction.cost(); + } + assertTrue(cost < 0.5); + } + + @Test public void testRegionLoadCost() { List regionLoads = new ArrayList<>(); for (int i = 1; i < 5; i++) { -- 2.10.1 (Apple Git-78)