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 2011/10/29 05:37:17 UTC
svn commit: r1190748 -
/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java
Author: tedyu
Date: Sat Oct 29 03:37:16 2011
New Revision: 1190748
URL: http://svn.apache.org/viewvc?rev=1190748&view=rev
Log:
HBASE-4694 Addendum, restore non-logging statements in DefaultLoadBalancer
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java?rev=1190748&r1=1190747&r2=1190748&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java Sat Oct 29 03:37:16 2011
@@ -229,7 +229,14 @@ public class DefaultLoadBalancer impleme
NavigableMap<ServerAndLoad, List<HRegionInfo>> serversByLoad =
new TreeMap<ServerAndLoad, List<HRegionInfo>>();
int numRegions = 0;
-
+ // Iterate so we can count regions as we build the map
+ for (Map.Entry<ServerName, List<HRegionInfo>> server: clusterState.entrySet()) {
+ List<HRegionInfo> regions = server.getValue();
+ int sz = regions.size();
+ if (sz == 0) emptyRegionServerPresent = true;
+ numRegions += sz;
+ serversByLoad.put(new ServerAndLoad(server.getKey(), sz), regions);
+ }
// Check if we even need to do any load balancing
float average = (float)numRegions / numServers; // for logging
// HBASE-3681 check sloppiness first