HBASE-1868 Spew about rebalancing but none done....
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@820173 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack
parent
c2db3972ec
commit
9719bcba95
|
|
@ -196,8 +196,8 @@ class RegionManager implements HConstants {
|
|||
|
||||
// figure out what regions need to be assigned and aren't currently being
|
||||
// worked on elsewhere.
|
||||
Set<RegionState> regionsToAssign = regionsAwaitingAssignment(info.getServerAddress(),
|
||||
isSingleServer);
|
||||
Set<RegionState> regionsToAssign =
|
||||
regionsAwaitingAssignment(info.getServerAddress(), isSingleServer);
|
||||
if (regionsToAssign.size() == 0) {
|
||||
// There are no regions waiting to be assigned.
|
||||
if (!inSafeMode()) {
|
||||
|
|
@ -224,22 +224,32 @@ class RegionManager implements HConstants {
|
|||
* Note that no synchronization is needed while we iterate over
|
||||
* regionsInTransition because this method is only called by assignRegions
|
||||
* whose caller owns the monitor for RegionManager
|
||||
*
|
||||
* TODO: This code is unintelligible. REWRITE. Add TESTS! St.Ack 09/30/2009
|
||||
* @param thisServersLoad
|
||||
* @param regionsToAssign
|
||||
* @param info
|
||||
* @param returnMsgs
|
||||
*/
|
||||
private void assignRegionsToMultipleServers(final HServerLoad thisServersLoad,
|
||||
final Set<RegionState> regionsToAssign, final HServerInfo info,
|
||||
final ArrayList<HMsg> returnMsgs) {
|
||||
|
||||
boolean isMetaAssign = false;
|
||||
for (RegionState s : regionsToAssign) {
|
||||
if (s.getRegionInfo().isMetaRegion())
|
||||
isMetaAssign = true;
|
||||
}
|
||||
|
||||
int nRegionsToAssign = regionsToAssign.size();
|
||||
// Now many regions to assign this server.
|
||||
int nregions = regionsPerServer(nRegionsToAssign, thisServersLoad);
|
||||
LOG.debug("Assigning for " + info + ": total nregions to assign=" +
|
||||
nRegionsToAssign + ", nregions to reach balance=" + nregions +
|
||||
", isMetaAssign=" + isMetaAssign);
|
||||
if (nRegionsToAssign <= nregions) {
|
||||
// I do not know whats supposed to happen in this case. Assign one.
|
||||
LOG.debug("Assigning one region only (playing it safe..)");
|
||||
assignRegions(regionsToAssign, 1, info, returnMsgs);
|
||||
} else {
|
||||
nRegionsToAssign -= nregions;
|
||||
if (nRegionsToAssign > 0 || isMetaAssign) {
|
||||
// We still have more regions to assign. See how many we can assign
|
||||
|
|
@ -247,16 +257,13 @@ class RegionManager implements HConstants {
|
|||
// most heavily loaded server.
|
||||
HServerLoad heavierLoad = new HServerLoad();
|
||||
int nservers = computeNextHeaviestLoad(thisServersLoad, heavierLoad);
|
||||
|
||||
nregions = 0;
|
||||
|
||||
// Advance past any less-loaded servers
|
||||
for (HServerLoad load = new HServerLoad(thisServersLoad);
|
||||
load.compareTo(heavierLoad) <= 0 && nregions < nRegionsToAssign;
|
||||
load.setNumberOfRegions(load.getNumberOfRegions() + 1), nregions++) {
|
||||
// continue;
|
||||
}
|
||||
|
||||
LOG.debug("Doing for " + info + " nregions: " + nregions +
|
||||
" and nRegionsToAssign: " + nRegionsToAssign);
|
||||
if (nregions < nRegionsToAssign) {
|
||||
|
|
@ -265,31 +272,43 @@ class RegionManager implements HConstants {
|
|||
if (nservers > 0) {
|
||||
// There are other servers that can share the load.
|
||||
// Split regions that need assignment across the servers.
|
||||
nregions = (int) Math.ceil((1.0 * nRegionsToAssign)
|
||||
/ (1.0 * nservers));
|
||||
nregions = (int) Math.ceil((1.0 * nRegionsToAssign)/(1.0 * nservers));
|
||||
} else {
|
||||
// No other servers with same load.
|
||||
// Split regions over all available servers
|
||||
nregions = (int) Math.ceil((1.0 * nRegionsToAssign)
|
||||
/ (1.0 * master.serverManager.numServers()));
|
||||
nregions = (int) Math.ceil((1.0 * nRegionsToAssign)/
|
||||
(1.0 * master.serverManager.numServers()));
|
||||
}
|
||||
} else {
|
||||
// Assign all regions to this server
|
||||
nregions = nRegionsToAssign;
|
||||
}
|
||||
|
||||
if (nregions > this.maxAssignInOneGo) {
|
||||
nregions = this.maxAssignInOneGo;
|
||||
assignRegions(regionsToAssign, nregions, info, returnMsgs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Assign <code>nregions</code> regions.
|
||||
* @param regionsToAssign
|
||||
* @param nregions
|
||||
* @param info
|
||||
* @param returnMsgs
|
||||
*/
|
||||
private void assignRegions(final Set<RegionState> regionsToAssign,
|
||||
final int nregions, final HServerInfo info,
|
||||
final ArrayList<HMsg> returnMsgs) {
|
||||
int count = nregions;
|
||||
if (count > this.maxAssignInOneGo) {
|
||||
count = this.maxAssignInOneGo;
|
||||
}
|
||||
for (RegionState s: regionsToAssign) {
|
||||
doRegionAssignment(s, info, returnMsgs);
|
||||
if (--nregions <= 0) {
|
||||
if (--count <= 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Assign all to the only server. An unlikely case but still possible.
|
||||
|
|
@ -332,7 +351,6 @@ class RegionManager implements HConstants {
|
|||
*/
|
||||
private int regionsPerServer(final int numUnassignedRegions,
|
||||
final HServerLoad thisServersLoad) {
|
||||
|
||||
SortedMap<HServerLoad, Set<String>> lightServers =
|
||||
new TreeMap<HServerLoad, Set<String>>();
|
||||
|
||||
|
|
@ -353,7 +371,6 @@ class RegionManager implements HConstants {
|
|||
nRegions += 1;
|
||||
} while (lightLoad.compareTo(thisServersLoad) <= 0
|
||||
&& nRegions < numUnassignedRegions);
|
||||
|
||||
nRegions *= e.getValue().size();
|
||||
if (nRegions >= numUnassignedRegions) {
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in New Issue