HBASE-3113 Don't reassign regions if cluster is being shutdown

M src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
  Bit of javadoc.
M src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
  If bad server, pass in name of bad server when remaking assignment
  plan -- i missed this important part on commit of part 2 of 3113.


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1023179 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-10-16 05:07:50 +00:00
parent 509beae1e2
commit dcbcd4f2d4
3 changed files with 5 additions and 1 deletions

View File

@ -585,6 +585,7 @@ Release 0.21.0 - Unreleased
it fails to replicate
HBASE-3044 [replication] ReplicationSource won't cleanup logs if there's
nothing to replicate
HBASE-3113 Don't reassign regions if cluster is being shutdown
IMPROVEMENTS

View File

@ -699,7 +699,7 @@ public class AssignmentManager extends ZooKeeperListener {
this.regionPlans.remove(state.getRegion().getEncodedName());
// Put in place a new plan and reassign. Calling getRegionPlan will add
// a plan if none exists (We removed it in line above).
if (getRegionPlan(state) == null) return;
if (getRegionPlan(state, plan.getDestination()) == null) return;
assign(state);
}
}

View File

@ -614,6 +614,9 @@ public class ServerManager {
return regionCount;
}
/**
* @return A copy of the internal list of online servers.
*/
public List<HServerInfo> getOnlineServersList() {
// TODO: optimize the load balancer call so we don't need to make a new list
return new ArrayList<HServerInfo>(onlineServers.values());