merge conflict fix

Author: clarax

hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java

@@ -1034,10 +1034,10 @@ public String toString() {
     }
 
     private double getSkewChangeFor(int serverIndex, int tableIndex, double regionCountChange) {
-      double curSkew = Math
-        .abs(numRegionsPerServerPerTable[serverIndex][tableIndex] - meanRegionsPerTable[tableIndex]);
-      double oldSkew = Math.abs(
-        numRegionsPerServerPerTable[serverIndex][tableIndex] - regionCountChange - meanRegionsPerTable[tableIndex]);
+      double curSkew = Math.abs(numRegionsPerServerPerTable[serverIndex][tableIndex] -
+        meanRegionsPerTable[tableIndex]);
+      double oldSkew = Math.abs(numRegionsPerServerPerTable[serverIndex][tableIndex] -
+        regionCountChange - meanRegionsPerTable[tableIndex]);
       return curSkew - oldSkew;
     }
   }

hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java

@@ -1508,7 +1508,6 @@ public static String composeAttributeName(String tableName, String costFunctionN
    * @param max The Max value
    * @param value The value to be scaled.
    * @return The scaled value.
-   * TBD: To be refactored to CostFunction when cost funtion is refactored out
    */
   static double scale(double min, double max, double value) {
     if (max <= min || value <= min

hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerBalanceCluster.java

@@ -51,7 +51,7 @@ public class TestStochasticLoadBalancerBalanceCluster extends BalancerTestBase {
    */
   @Test
   public void testBalanceCluster() throws Exception {
-    conf.setLong("hbase.master.balancer.stochastic.maxRunningTime", 3 * 60 * 1000); // 3 min
+    conf.setLong("hbase.master.balancer.stochastic.maxRunningTime", 300 * 1000); // 300 sec
     conf.setFloat("hbase.master.balancer.stochastic.maxMovePercent", 1.0f);
     loadBalancer.setConf(conf);
     for (int[] mockCluster : clusterStateMocks) {