svn commit: r1042887 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java

[stack]

Author: stack
Date: Tue Dec  7 01:19:56 2010
New Revision: 1042887

URL: http://svn.apache.org/viewvc?rev=1042887&view=rev
Log:
HBASE-3315 Add debug output for when balancer makes bad balance

Modified:
    hbase/branches/0.90/CHANGES.txt
    
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1042887&r1=1042886&r2=1042887&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Tue Dec  7 01:19:56 2010
@@ -728,6 +728,7 @@ Release 0.90.0 - Unreleased
    HBASE-3310  Failing creating/altering table with compression agrument from 
                the HBase shell (Igor Ranitovic via Stack)
    HBASE-3314  [shell] 'move' is broken
+   HBASE-3315  Add debug output for when balancer makes bad balance
 
 
   IMPROVEMENTS

Modified: 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java?rev=1042887&r1=1042886&r2=1042887&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
 (original)
+++ 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
 Tue Dec  7 01:19:56 2010
@@ -293,11 +293,20 @@ public class LoadBalancer {
 
     long endTime = System.currentTimeMillis();
 
-    assert(regionidx == regionsToMove.size()): "clusterState=" + clusterState +
-      ", regionidx=" + regionidx + ", regionsToMove=" + regionsToMove +
+    if (regionidx != regionsToMove.size() || neededRegions != 0) {
+      // Emit data so can diagnose how balancer went astray.
+      LOG.warn("regionidx=" + regionidx + ", regionsToMove=" + 
regionsToMove.size() +
       ", numServers=" + numServers + ", serversOverloaded=" + 
serversOverloaded +
-      ", serversUnderloaded=" + serversUnderloaded;
-    assert(neededRegions == 0);
+      ", serversUnderloaded=" + serversUnderloaded);
+      StringBuilder sb = new StringBuilder();
+      for (Map.Entry<HServerInfo, List<HRegionInfo>> e: 
clusterState.entrySet()) {
+        if (sb.length() > 0) sb.append(", ");
+        sb.append(e.getKey().getServerName());
+        sb.append(" ");
+        sb.append(e.getValue().size());
+      }
+      LOG.warn("Input " + sb.toString());
+    }
 
     // All done!
     LOG.info("Calculated a load balance in " + (endTime-startTime) + "ms. " +
@@ -636,7 +645,7 @@ public class LoadBalancer {
     public String toString() {
       return "hri=" + this.hri.getRegionNameAsString() + ", src=" +
         (this.source == null? "": this.source.getServerName()) +
-        ", dest=" + this.dest.getServerName();
+        ", dest=" + (this.dest == null? "": this.dest.getServerName());
     }
   }
 }