hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jxi...@apache.org
Subject git commit: HBASE-11531 RegionStates for regions under region-in-transition znode are not updated on startup
Date Fri, 25 Jul 2014 15:47:54 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 13643807a -> b7e0bde34


HBASE-11531 RegionStates for regions under region-in-transition znode are not updated on startup


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b7e0bde3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b7e0bde3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b7e0bde3

Branch: refs/heads/branch-1
Commit: b7e0bde3469695480bc58c06d4c568886a637cc0
Parents: 1364380
Author: Jimmy Xiang <jxiang@cloudera.com>
Authored: Wed Jul 23 15:30:32 2014 -0700
Committer: Jimmy Xiang <jxiang@cloudera.com>
Committed: Fri Jul 25 08:47:31 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/b7e0bde3/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index 037a900..19e9e2f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -474,7 +474,7 @@ public class AssignmentManager extends ZooKeeperListener {
 
     if (!useZKForAssignment) {
       // Not use ZK for assignment any more, remove the ZNode
-      ZKUtil.deleteNodeFailSilent(watcher, watcher.assignmentZNode);
+      ZKUtil.deleteNodeRecursively(watcher, watcher.assignmentZNode);
     }
     recoverTableInDisablingState();
     recoverTableInEnablingState();
@@ -733,7 +733,8 @@ public class AssignmentManager extends ZooKeeperListener {
     final String prettyPrintedRegionName = HRegionInfo.prettyPrint(encodedName);
     LOG.info("Processing " + prettyPrintedRegionName + " in state: " + et);
 
-    if (regionStates.isRegionInTransition(encodedName)) {
+    if (regionStates.isRegionInTransition(encodedName)
+        && (regionInfo.isMetaRegion() || !useZKForAssignment)) {
       LOG.info("Processed region " + prettyPrintedRegionName + " in state: "
         + et + ", does nothing since the region is already in transition "
         + regionStates.getRegionTransitionState(encodedName));


Mime
View raw message