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

[te...@apache.org]

Author: tedyu
Date: Fri Apr  6 13:40:36 2012
New Revision: 1310321

URL: http://svn.apache.org/viewvc?rev=1310321&view=rev
Log:
HBASE-5615 revert due to race condition in case master dies

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

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1310321&r1=1310320&r2=1310321&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Apr  6 13:40:36 2012
@@ -15,7 +15,6 @@ Release 0.92.2 - Unreleased
                to an inexistent cluster
    HBASE-5624  Aborting regionserver when splitting region, may cause daughter
                region not assigned by ServerShutdownHandler (Chunhui Shen)
-   HBASE-5615  The master never does balance because of balancing the parent region (Xufeng)
    HBASE-5596  Few minor bugs from HBASE-5209 (David S. Wang)
    HBASE-5669  AggregationClient fails validation for open stoprow scan
                (Mubarak Seyed)

Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1310321&r1=1310320&r2=1310321&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Fri Apr  6 13:40:36 2012
@@ -2376,7 +2376,6 @@ public class AssignmentManager extends Z
       ServerName regionLocation = region.getSecond();
       if (regionInfo == null) continue;
       String tableName = regionInfo.getTableNameAsString();
-      if (regionInfo.isOffline() && regionInfo.isSplit()) continue;
       if (regionLocation == null) {
         // regionLocation could be null if createTable didn't finish properly.
         // When createTable is in progress, HMaster restarts.