From 829f254216e28735d0fbe1331a0fc11c018df375 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Wed, 8 Jun 2011 16:36:53 +0000
Subject: [PATCH] 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                                         |  2 ++
 .../hadoop/hbase/master/AssignmentManager.java      | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f6f69633eac..5d75031cd2f 100644
--- a/CHANGES.txt
+++ b/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
diff --git a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index 38914a834a9..03d94aae7b4 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ b/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,
-            this.master.getServerName());
+          // Process with existing RS shutdown code  
+          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);
       }
     }
   }