svn commit: r617767 - in /hadoop/core/trunk/src/contrib/hbase: CHANGES.txt src/java/org/apache/hadoop/hbase/HMaster.java

[jimk]

Author: jimk
Date: Fri Feb  1 23:19:25 2008
New Revision: 617767

URL: http://svn.apache.org/viewvc?rev=617767&view=rev
Log:
HADOOP-2773 Master marks region offline when it is recovering from a region 
server death

Modified:
    hadoop/core/trunk/src/contrib/hbase/CHANGES.txt
    
hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java

Modified: hadoop/core/trunk/src/contrib/hbase/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hbase/CHANGES.txt?rev=617767&r1=617766&r2=617767&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ hadoop/core/trunk/src/contrib/hbase/CHANGES.txt Fri Feb  1 23:19:25 2008
@@ -18,6 +18,8 @@
    HADOOP-2693 NPE in getClosestRowBefore (Bryan Duxbury & Stack)
    HADOOP-2599 Some minor improvements to changes in HADOOP-2443
                (Bryan Duxbury & Stack)
+   HADOOP-2773 Master marks region offline when it is recovering from a region
+               server death
 
   IMPROVEMENTS
    HADOOP-2555 Refactor the HTable#get and HTable#getRow methods to avoid

Modified: 
hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java?rev=617767&r1=617766&r2=617767&view=diff
==============================================================================
--- 
hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java
 (original)
+++ 
hadoop/core/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java
 Fri Feb  1 23:19:25 2008
@@ -2103,7 +2103,7 @@
       for (ToDoEntry e: toDoList) {
         if (e.deleteRegion) {
           HRegion.removeRegionFromMETA(server, regionName, e.row);
-        } else {
+        } else if (e.regionOffline) {
           HRegion.offlineRegionInMETA(server, regionName, e.info);
         }
       }