HBASE-3946 The splitted region can be online again while the standby hmaster becomes the active one

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

CHANGES.txt

@@ -308,6 +308,8 @@ Release 0.90.4 - Unreleased
                the same time (Jieshan Bean)
    HBASE-3934  MemStoreFlusher.getMemStoreLimit() doesn't honor defaultLimit
                (Ted Yu)
+   HBASE-3946  The splitted region can be online again while the standby
+               hmaster becomes the active one (Jieshan Bean)
 
   IMPROVEMENT
    HBASE-3882  hbase-config.sh needs to be updated so it can auto-detects the

src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

@@ -1687,14 +1687,17 @@ public class AssignmentManager extends ZooKeeperListener {
         Result result = region.getSecond();
         // If region was in transition (was in zk) force it offline for reassign
         try {
-          ZKAssign.createOrForceNodeOffline(watcher, regionInfo,
+          // Process with existing RS shutdown code  
-            this.master.getServerName());
+          boolean isNotDisabledAndSplitted =
+            ServerShutdownHandler.processDeadRegion(regionInfo, result, this,
+            this.catalogTracker);
+          if (isNotDisabledAndSplitted) {
+            ZKAssign.createOrForceNodeOffline(watcher, regionInfo,
+              master.getServerName()); 
+          }
         } catch (KeeperException.NoNodeException nne) {
           // This is fine
         }
-        // Process with existing RS shutdown code
-        ServerShutdownHandler.processDeadRegion(regionInfo, result, this,
-            this.catalogTracker);
       }
     }
   }