svn commit: r1023179 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java src/main/java/org/apache/hadoop/hbase/master/ServerManager.java

[st...@apache.org]

Author: stack
Date: Sat Oct 16 05:07:50 2010
New Revision: 1023179

URL: http://svn.apache.org/viewvc?rev=1023179&view=rev
Log:
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.

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1023179&r1=1023178&r2=1023179&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sat Oct 16 05:07:50 2010
@@ -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

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1023179&r1=1023178&r2=1023179&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Sat Oct 16 05:07:50 2010
@@ -699,7 +699,7 @@ public class AssignmentManager extends Z
       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);
     }
   }

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java?rev=1023179&r1=1023178&r2=1023179&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java Sat Oct 16 05:07:50 2010
@@ -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());