[07/22] hbase git commit: HBASE-15239 Remove unused LoadBalancer.immediateAssignment()

2016-02-13 Thread syuanjiang 
HBASE-15239 Remove unused LoadBalancer.immediateAssignment()


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

Branch: refs/heads/hbase-12439
Commit: d53318163be54ff8b0eff44402fdf5b16a233100
Parents: df829ea
Author: Matteo Bertozzi 
Authored: Wed Feb 10 09:16:42 2016 -0800
Committer: Matteo Bertozzi 
Committed: Wed Feb 10 09:16:42 2016 -0800

--
 .../hadoop/hbase/master/LoadBalancer.java   | 15 
 .../hbase/master/balancer/BaseLoadBalancer.java | 39 ++--
 .../master/balancer/SimpleLoadBalancer.java |  6 +--
 .../master/balancer/TestBaseLoadBalancer.java   | 32 
 4 files changed, 4 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d5331816/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
index 15dedc6..6a618e1 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
@@ -40,10 +40,6 @@ import org.apache.hadoop.hbase.TableName;
  * Cluster-wide load balancing will occur only when there are no regions in
  * transition and according to a fixed period of a time using {@link 
#balanceCluster(Map)}.
  *
- * Inline region placement with {@link #immediateAssignment} can be used 
when
- * the Master needs to handle closed regions that it currently does not have
- * a destination set for.  This can happen during master failover.
- *
  * On cluster startup, bulk assignment can be used to determine
  * locations for all Regions in a cluster.
  *
@@ -106,17 +102,6 @@ public interface LoadBalancer extends Configurable, 
Stoppable, ConfigurationObse
   ) throws HBaseIOException;
 
   /**
-   * Sync assign a region
-   * @param regions
-   * @param servers
-* @return Map regioninfos to servernames
-   */
-  Map immediateAssignment(
-List regions,
-List servers
-  ) throws HBaseIOException;
-
-  /**
* Get a random region server from the list
* @param regionInfo Region for which this selection is being done.
* @param servers

http://git-wip-us.apache.org/repos/asf/hbase/blob/d5331816/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 44e1f79..bde5c61 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
@@ -81,16 +81,16 @@ public abstract class BaseLoadBalancer implements 
LoadBalancer {
   return UNKNOWN_RACK;
 }
   }
-  
+
   /**
* The constructor that uses the basic MetricsBalancer
*/
   protected BaseLoadBalancer() {
 metricsBalancer = new MetricsBalancer();
   }
-  
+
   /**
-   * This Constructor accepts an instance of MetricsBalancer, 
+   * This Constructor accepts an instance of MetricsBalancer,
* which will be used instead of creating a new one
*/
   protected BaseLoadBalancer(MetricsBalancer metricsBalancer) {
@@ -1279,39 +1279,6 @@ public abstract class BaseLoadBalancer implements 
LoadBalancer {
   }
 
   /**
-   * Generates an immediate assignment plan to be used by a new master for
-   * regions in transition that do not have an already known destination.
-   *
-   * Takes a list of regions that need immediate assignment and a list of all
-   * available servers. Returns a map of regions to the server they should be
-   * assigned to.
-   *
-   * This method will return quickly and does not do any intelligent balancing.
-   * The goal is to make a fast decision not the best decision possible.
-   *
-   * Currently this is random.
-   *
-   * @param regions
-   * @param servers
-   * @return map of regions to the server it should be assigned to
-   */
-  @Override
-  public Map immediateAssignment(List 
regions,
-  List servers) {
-metricsBalancer.incrMiscInvocations();
-if (servers == null || servers.isEmpty()) {
-  LOG.warn("Wanted to do random assignment but no servers to assign to");
-

hbase git commit: HBASE-15239 Remove unused LoadBalancer.immediateAssignment()

2016-02-10 Thread mbertozzi 
Repository: hbase
Updated Branches:
  refs/heads/master df829ea7d -> d53318163


HBASE-15239 Remove unused LoadBalancer.immediateAssignment()


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

Branch: refs/heads/master
Commit: d53318163be54ff8b0eff44402fdf5b16a233100
Parents: df829ea
Author: Matteo Bertozzi 
Authored: Wed Feb 10 09:16:42 2016 -0800
Committer: Matteo Bertozzi 
Committed: Wed Feb 10 09:16:42 2016 -0800

--
 .../hadoop/hbase/master/LoadBalancer.java   | 15 
 .../hbase/master/balancer/BaseLoadBalancer.java | 39 ++--
 .../master/balancer/SimpleLoadBalancer.java |  6 +--
 .../master/balancer/TestBaseLoadBalancer.java   | 32 
 4 files changed, 4 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d5331816/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
index 15dedc6..6a618e1 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
@@ -40,10 +40,6 @@ import org.apache.hadoop.hbase.TableName;
  * Cluster-wide load balancing will occur only when there are no regions in
  * transition and according to a fixed period of a time using {@link 
#balanceCluster(Map)}.
  *
- * Inline region placement with {@link #immediateAssignment} can be used 
when
- * the Master needs to handle closed regions that it currently does not have
- * a destination set for.  This can happen during master failover.
- *
  * On cluster startup, bulk assignment can be used to determine
  * locations for all Regions in a cluster.
  *
@@ -106,17 +102,6 @@ public interface LoadBalancer extends Configurable, 
Stoppable, ConfigurationObse
   ) throws HBaseIOException;
 
   /**
-   * Sync assign a region
-   * @param regions
-   * @param servers
-* @return Map regioninfos to servernames
-   */
-  Map immediateAssignment(
-List regions,
-List servers
-  ) throws HBaseIOException;
-
-  /**
* Get a random region server from the list
* @param regionInfo Region for which this selection is being done.
* @param servers

http://git-wip-us.apache.org/repos/asf/hbase/blob/d5331816/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 44e1f79..bde5c61 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
@@ -81,16 +81,16 @@ public abstract class BaseLoadBalancer implements 
LoadBalancer {
   return UNKNOWN_RACK;
 }
   }
-  
+
   /**
* The constructor that uses the basic MetricsBalancer
*/
   protected BaseLoadBalancer() {
 metricsBalancer = new MetricsBalancer();
   }
-  
+
   /**
-   * This Constructor accepts an instance of MetricsBalancer, 
+   * This Constructor accepts an instance of MetricsBalancer,
* which will be used instead of creating a new one
*/
   protected BaseLoadBalancer(MetricsBalancer metricsBalancer) {
@@ -1279,39 +1279,6 @@ public abstract class BaseLoadBalancer implements 
LoadBalancer {
   }
 
   /**
-   * Generates an immediate assignment plan to be used by a new master for
-   * regions in transition that do not have an already known destination.
-   *
-   * Takes a list of regions that need immediate assignment and a list of all
-   * available servers. Returns a map of regions to the server they should be
-   * assigned to.
-   *
-   * This method will return quickly and does not do any intelligent balancing.
-   * The goal is to make a fast decision not the best decision possible.
-   *
-   * Currently this is random.
-   *
-   * @param regions
-   * @param servers
-   * @return map of regions to the server it should be assigned to
-   */
-  @Override
-  public Map immediateAssignment(List 
regions,
-  List servers) {
-metricsBalancer.incrMiscInvocations();
-if (servers == null || servers.isEmpty()) {
-