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

[stack]

Author: stack
Date: Thu May 26 03:58:52 2011
New Revision: 1127781

URL: http://svn.apache.org/viewvc?rev=1127781&view=rev
Log:
HBASE-3906 When HMaster is running,there are a lot of RegionLoad instances（far 
greater than the regions）,it has risk of OOME.

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

Modified: hbase/branches/0.90/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1127781&r1=1127780&r2=1127781&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu May 26 03:58:52 2011
@@ -27,6 +27,8 @@ Release 0.90.4 - Unreleased
    HBASE-3920  HLog hbase.regionserver.flushlogentries no longer supported
                (Dave Latham)
    HBASE-3919  More places output binary data to text (Dave Latham)
+   HBASE-3906  When HMaster is running,there are a lot of RegionLoad instances
+               far greater than the regions）,it has risk of OOME (Jian Zhang)
 
 Release 0.90.3 - May 19th, 2011
   BUG FIXES

Modified: 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1127781&r1=1127780&r2=1127781&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 (original)
+++ 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 Thu May 26 03:58:52 2011
@@ -602,8 +602,12 @@ public class AssignmentManager extends Z
       HServerInfo hsi = this.regions.get(regionInfo);
       if (hsi != null) LOG.warn("Overwriting " + regionInfo.getEncodedName() +
         " on " + hsi);
-      this.regions.put(regionInfo, serverInfo);
-      addToServers(serverInfo, regionInfo);
+      
+      HServerInfo hsiWithoutLoad = new HServerInfo(
+        serverInfo.getServerAddress(), serverInfo.getStartCode(),
+        serverInfo.getInfoPort(), serverInfo.getHostname());
+      this.regions.put(regionInfo, hsiWithoutLoad);
+      addToServers(hsiWithoutLoad, regionInfo);
       this.regions.notifyAll();
     }
     // Remove plan if one.