hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject [09/12] git commit: HBASE-11546 Backport ZK-less region assignment to 0.98 (Virag Kothari) [5/8]
Date Tue, 26 Aug 2014 15:15:27 GMT
HBASE-11546 Backport ZK-less region assignment to 0.98 (Virag Kothari) [5/8]

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


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

Branch: refs/heads/0.98
Commit: f51b68b280561fbd52ecd5afd514877954d1e190
Parents: 44f646c
Author: Andrew Purtell <apurtell@apache.org>
Authored: Tue Aug 26 08:01:10 2014 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Tue Aug 26 08:03:56 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/f51b68b2/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 1700a56..b657ed4 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
@@ -499,7 +499,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();
@@ -743,7 +743,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