Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1446784 -
 /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Date: Fri, 15 Feb 2013 21:37:51 -0000
To: commits@hbase.apache.org
From: jxiang@apache.org
Message-Id: <20130215213751.BFC8223888D2@eris.apache.org>

Author: jxiang
Date: Fri Feb 15 21:37:51 2013
New Revision: 1446784

URL: http://svn.apache.org/r1446784
Log:
HBASE-7799 reassigning region stuck in open still may not work correctly due to leftover ZK node

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1446784&r1=1446783&r2=1446784&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Fri Feb 15 21:37:51 2013
@@ -2806,6 +2806,12 @@ public class AssignmentManager extends Z
             + " since it is not opening on the dead server any more: " + sn);
           it.remove();
         } else {
+          try{
+            // Delete the ZNode if exists
+            ZKAssign.deleteNodeFailSilent(watcher, hri);
+          } catch (KeeperException ke) {
+            server.abort("Unexpected ZK exception deleting node " + hri, ke);
+          }
           // Mark the region closed and assign it again by SSH
           regionStates.updateRegionState(hri, RegionState.State.CLOSED);
         }