You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/03/05 19:41:03 UTC
svn commit: r1297155 - in
/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master:
AssignmentManager.java DefaultLoadBalancer.java LoadBalancer.java
Author: tedyu
Date: Mon Mar 5 18:41:03 2012
New Revision: 1297155
URL: http://svn.apache.org/viewvc?rev=1297155&view=rev
Log:
HBASE-5010 Pass region info in LoadBalancer.randomAssignment(List<ServerName> servers) (Anoop Sam John)
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1297155&r1=1297154&r2=1297155&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Mon Mar 5 18:41:03 2012
@@ -1785,7 +1785,7 @@ public class AssignmentManager extends Z
if (servers.isEmpty()) return null;
RegionPlan randomPlan = new RegionPlan(state.getRegion(), null,
- balancer.randomAssignment(servers));
+ balancer.randomAssignment(state.getRegion(), servers));
boolean newPlan = false;
RegionPlan existingPlan = null;
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java?rev=1297155&r1=1297154&r2=1297155&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java Mon Mar 5 18:41:03 2012
@@ -759,7 +759,8 @@ public class DefaultLoadBalancer impleme
return assignments;
}
- public ServerName randomAssignment(List<ServerName> servers) {
+ public ServerName randomAssignment(HRegionInfo regionInfo,
+ List<ServerName> servers) {
if (servers == null || servers.isEmpty()) {
LOG.warn("Wanted to do random assignment but no servers to assign to");
return null;
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java?rev=1297155&r1=1297154&r2=1297155&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java Mon Mar 5 18:41:03 2012
@@ -44,7 +44,7 @@ import java.util.Map;
*
* <p>This classes produces plans for the {@link AssignmentManager} to execute.
*/
-@InterfaceAudience.Private
+@InterfaceAudience.Public
public interface LoadBalancer extends Configurable {
/**
@@ -93,8 +93,10 @@ public interface LoadBalancer extends Co
/**
* Get a random region server from the list
+ * @param regionInfo Region for which this selection is being done.
* @param servers
* @return Servername
*/
- public ServerName randomAssignment(List<ServerName> servers);
+ public ServerName randomAssignment(HRegionInfo regionInfo,
+ List<ServerName> servers);
}