svn commit: r693935 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java

[jd...@apache.org]

Author: jdcryans
Date: Wed Sep 10 12:20:17 2008
New Revision: 693935

URL: http://svn.apache.org/viewvc?rev=693935&view=rev
Log:
HBASE-881   Fixed bug when Master tries to reassign split or offline regions from a dead server

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=693935&r1=693934&r2=693935&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Wed Sep 10 12:20:17 2008
@@ -7,6 +7,8 @@
    HBASE-822   Update thrift README and HBase.thrift to use thrift 20080411
 
   BUG FIXES
+   HBASE-881   Fixed bug when Master tries to reassign split or offline regions
+               from a dead server
    HBASE-860   Fixed Bug in IndexTableReduce where it concerns writing lucene 
                index fields.
    HBASE-805   Remove unnecessary getRow overloads in HRS (Jonathan Gray via

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java?rev=693935&r1=693934&r2=693935&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java Wed Sep 10 12:20:17 2008
@@ -147,8 +147,10 @@
           // Mark region offline
           todo.regionOffline = true;
         } else {
-          // Get region reassigned
-          regions.add(info);
+          if (!info.isOffline() && !info.isSplit()) {
+            // Get region reassigned
+            regions.add(info);
+          }
         }
         // If it was pending, remove.
         master.regionManager.noLongerPending(info.getRegionName());