HADOOP-2773 Master marks region offline when it is recovering from a region server death

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@617767 13f79535-47bb-0310-9956-ffa450edef68

src/contrib/hbase/CHANGES.txt

@@ -18,6 +18,8 @@ Trunk (unreleased changes)
    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

src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java

@@ -2103,7 +2103,7 @@ public class HMaster extends Thread implements HConstants, HMasterInterface,
       for (ToDoEntry e: toDoList) {
         if (e.deleteRegion) {
           HRegion.removeRegionFromMETA(server, regionName, e.row);
-        } else {
+        } else if (e.regionOffline) {
           HRegion.offlineRegionInMETA(server, regionName, e.info);
         }
       }