hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chia7...@apache.org
Subject hbase git commit: HBASE-18480 The cost of BaseLoadBalancer.cluster is changed even if the rollback is done
Date Wed, 02 Aug 2017 00:47:34 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 3f540f380 -> b4f8377aa


HBASE-18480 The cost of BaseLoadBalancer.cluster is changed even if the rollback is done


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b4f8377a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b4f8377a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b4f8377a

Branch: refs/heads/branch-2
Commit: b4f8377aa08448ef75be8277af87b1bc89d58529
Parents: 3f540f3
Author: Chia-Ping Tsai <chia7712@gmail.com>
Authored: Wed Aug 2 08:43:04 2017 +0800
Committer: Chia-Ping Tsai <chia7712@gmail.com>
Committed: Wed Aug 2 08:43:04 2017 +0800

----------------------------------------------------------------------
 .../hbase/master/balancer/BaseLoadBalancer.java |  1 +
 .../master/balancer/StochasticLoadBalancer.java | 11 +++++++---
 .../balancer/TestStochasticLoadBalancer.java    | 21 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/b4f8377a/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 785f6d5..8f5b6f5 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
@@ -805,6 +805,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];

http://git-wip-us.apache.org/repos/asf/hbase/blob/b4f8377a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
----------------------------------------------------------------------
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 ebd86be..56c2a24 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
@@ -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;
@@ -318,6 +319,12 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
     return balanceCluster(clusterState);
   }
 
+  @VisibleForTesting
+  Cluster.Action nextAction(Cluster cluster) {
+    return candidateGenerators.get(RANDOM.nextInt(candidateGenerators.size()))
+            .generate(cluster);
+  }
+
   /**
    * Given the cluster state this will try and approach an optimal balance. This
    * should always approach the optimal state given enough steps.
@@ -384,9 +391,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
     long step;
 
     for (step = 0; step < computedMaxSteps; step++) {
-      int generatorIdx = RANDOM.nextInt(candidateGenerators.size());
-      CandidateGenerator p = candidateGenerators.get(generatorIdx);
-      Cluster.Action action = p.generate(cluster);
+      Cluster.Action action = nextAction(cluster);
 
       if (action.type == Type.NULL) {
         continue;

http://git-wip-us.apache.org/repos/asf/hbase/blob/b4f8377a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java
----------------------------------------------------------------------
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 1dc1611..b97567d 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
@@ -281,6 +281,27 @@ public class TestStochasticLoadBalancer extends BalancerTestBase {
   }
 
   @Test
+  public void testCostAfterUndoAction() {
+    final int runs = 10;
+    loadBalancer.setConf(conf);
+    for (int[] mockCluster : clusterStateMocks) {
+      BaseLoadBalancer.Cluster cluster = mockCluster(mockCluster);
+      loadBalancer.initCosts(cluster);
+      for (int i = 0; i != runs; ++i) {
+        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


Mime
View raw message