You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/08/26 17:15:25 UTC
[07/12] git commit: HBASE-11546 Backport ZK-less region assignment to
0.98 (Virag Kothari) [3/8]
HBASE-11546 Backport ZK-less region assignment to 0.98 (Virag Kothari) [3/8]
HBASE-11725 Backport failover checking change to 1.0 (Jimmy Xiang)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7852df60
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7852df60
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7852df60
Branch: refs/heads/0.98
Commit: 7852df6069a8031f5c68fa48278bc16f60290a74
Parents: cbc7860
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Aug 26 08:01:10 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Aug 26 08:03:35 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/master/AssignmentManager.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7852df60/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 b6fd2cf..60e0afa 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
@@ -538,8 +538,10 @@ public class AssignmentManager extends ZooKeeperListener {
}
} else {
// If any one region except meta is assigned, it's a failover.
- for (HRegionInfo hri : regionStates.getRegionAssignments().keySet()) {
- if (!hri.isMetaTable()) {
+ Set<ServerName> onlineServers = serverManager.getOnlineServers().keySet();
+ for (Map.Entry<HRegionInfo, ServerName> en : regionStates.getRegionAssignments().entrySet()) {
+ HRegionInfo hri = en.getKey();
+ if (!hri.isMetaTable() && onlineServers.contains(en.getValue())) {
LOG.debug("Found " + hri + " out on cluster");
failover = true;
break;