diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java index 3bb12cee44..aabbfdd6e2 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java @@ -789,6 +789,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer { } else if (oldServer >= 0 && (numRegionsPerServerPerTable[oldServer][tableIndex] + 1) == numMaxRegionsPerTable[tableIndex]) { //recompute maxRegionsPerTable since the previous value was coming from the old server +// numMaxRegionsPerTable[tableIndex] = 0; for (int serverIndex = 0 ; serverIndex < numRegionsPerServerPerTable.length; serverIndex++) { if (numRegionsPerServerPerTable[serverIndex][tableIndex] > numMaxRegionsPerTable[tableIndex]) { numMaxRegionsPerTable[tableIndex] = numRegionsPerServerPerTable[serverIndex][tableIndex]; diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java index 0f29a1a977..c5041cafd5 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hbase.master.balancer; +import com.google.common.annotations.VisibleForTesting; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; @@ -316,6 +317,13 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { return balanceCluster(clusterState); } + @VisibleForTesting + Cluster.Action nextAction(Cluster cluster) { + int generatorIdx = RANDOM.nextInt(candidateGenerators.size()); + CandidateGenerator p = candidateGenerators.get(generatorIdx); + return p.generate(cluster); + } + /** * Given the cluster state this will try and approach an optimal balance. This * should always approach the optimal state given enough steps. @@ -376,9 +384,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { long step; for (step = 0; step < computedMaxSteps; step++) { - int generatorIdx = RANDOM.nextInt(candidateGenerators.length); - CandidateGenerator p = candidateGenerators[generatorIdx]; - Cluster.Action action = p.generate(cluster); + Cluster.Action action = nextAction(cluster); if (action.type == Type.NULL) { continue; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java index 125db06699..9adbe3c653 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java @@ -279,6 +279,27 @@ public class TestStochasticLoadBalancer extends BalancerTestBase { } @Test + public void testCostAfterUndoAction() { + final int runs = 10; + loadBalancer.setConf(conf); + for (int[] mockCluster : clusterStateMocks) { + for (int i = 0; i != runs; ++i) { + BaseLoadBalancer.Cluster cluster = mockCluster(mockCluster); + loadBalancer.initCosts(cluster); + final double expectedCost = loadBalancer.computeCost(cluster, Double.MAX_VALUE); + Cluster.Action action = loadBalancer.nextAction(cluster); + cluster.doAction(action); + loadBalancer.updateCostsWithAction(cluster, action); + Cluster.Action undoAction = action.undoAction(); + cluster.doAction(undoAction); + loadBalancer.updateCostsWithAction(cluster, undoAction); + final double actualCost = loadBalancer.computeCost(cluster, Double.MAX_VALUE); + assertEquals(expectedCost, actualCost, 0); + } + } + } + + @Test public void testTableSkewCost() { Configuration conf = HBaseConfiguration.create(); StochasticLoadBalancer.CostFunction