You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/02/18 15:24:05 UTC
hbase git commit: HBASE-13061 RegionStates can remove wrong region
from server holdings (Andrey Stepachev)
Repository: hbase
Updated Branches:
refs/heads/master 7b045d143 -> d64ce3106
HBASE-13061 RegionStates can remove wrong region from server holdings (Andrey Stepachev)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d64ce310
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d64ce310
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d64ce310
Branch: refs/heads/master
Commit: d64ce3106378ad505389ab7704127c498f92be37
Parents: 7b045d1
Author: tedyu <yu...@gmail.com>
Authored: Wed Feb 18 06:23:59 2015 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Wed Feb 18 06:23:59 2015 -0800
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/master/RegionStates.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d64ce310/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
index e5214ca..5b81e0d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
@@ -426,7 +426,9 @@ public class RegionStates {
if (oldServerName == null) {
oldServerName = oldAssignments.remove(encodedName);
}
- if (oldServerName != null && serverHoldings.containsKey(oldServerName)) {
+ if (oldServerName != null
+ && !oldServerName.equals(serverName)
+ && serverHoldings.containsKey(oldServerName)) {
LOG.info("Offlined " + hri.getShortNameToLog() + " from " + oldServerName);
removeFromServerHoldings(oldServerName, hri);
}