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 2015/09/16 02:42:57 UTC
[2/2] hbase git commit: HBASE-14434 Merge of HBASE-7332 to 0.98
dropped a hunk
HBASE-14434 Merge of HBASE-7332 to 0.98 dropped a hunk
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/13af5d2a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/13af5d2a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/13af5d2a
Branch: refs/heads/0.98
Commit: 13af5d2a24deacf30f4665b78d7316718ab47191
Parents: 7344676
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Sep 15 17:15:48 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Sep 15 17:15:48 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/master/RegionStates.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/13af5d2a/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 7c647f6..81d666d 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
@@ -933,6 +933,11 @@ public class RegionStates {
String encodedName = hri.getEncodedName();
regionsInTransition.remove(encodedName);
regionStates.remove(encodedName);
+ TableName table = hri.getTable();
+ Map<String, RegionState> indexMap = regionStatesTableIndex.get(table);
+ indexMap.remove(encodedName);
+ if (indexMap.size() == 0)
+ regionStatesTableIndex.remove(table);
lastAssignments.remove(encodedName);
ServerName sn = regionAssignments.remove(hri);
if (sn != null) {