You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2023/03/01 14:10:29 UTC
[hbase] 01/02: HBASE-23561 Look up of Region in Master by encoded region name is O(n) (#1193)
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 5f54d9cbad3e22df2bd65f4112fef2d2f5cba755
Author: Minwoo Kang <mi...@outlook.com>
AuthorDate: Sat Feb 22 01:40:45 2020 +0900
HBASE-23561 Look up of Region in Master by encoded region name is O(n) (#1193)
Signed-off-by: Wellington Chevreuil <wc...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../hbase/master/assignment/RegionStates.java | 30 ++++++++++++++--------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java
index 1ee326e044c..f6c77dd39ec 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStates.java
@@ -73,10 +73,17 @@ public class RegionStates {
* RegionName -- i.e. RegionInfo.getRegionName() -- as bytes to {@link RegionStateNode}
*/
private final ConcurrentSkipListMap<byte[], RegionStateNode> regionsMap =
- new ConcurrentSkipListMap<byte[], RegionStateNode>(Bytes.BYTES_COMPARATOR);
+ new ConcurrentSkipListMap<>(Bytes.BYTES_COMPARATOR);
+
+ /**
+ * this map is a hack to lookup of region in master by encoded region name is O(n). must put and
+ * remove with regionsMap.
+ */
+ private final ConcurrentSkipListMap<String, RegionStateNode> encodedRegionsMap =
+ new ConcurrentSkipListMap<>();
private final ConcurrentSkipListMap<RegionInfo, RegionStateNode> regionInTransition =
- new ConcurrentSkipListMap<RegionInfo, RegionStateNode>(RegionInfo.COMPARATOR);
+ new ConcurrentSkipListMap<>(RegionInfo.COMPARATOR);
/**
* Regions marked as offline on a read of hbase:meta. Unused or at least, once offlined, regions
@@ -99,6 +106,7 @@ public class RegionStates {
*/
public void clear() {
regionsMap.clear();
+ encodedRegionsMap.clear();
regionInTransition.clear();
regionOffline.clear();
serverMap.clear();
@@ -113,8 +121,11 @@ public class RegionStates {
// RegionStateNode helpers
// ==========================================================================
RegionStateNode createRegionStateNode(RegionInfo regionInfo) {
- return regionsMap.computeIfAbsent(regionInfo.getRegionName(),
- key -> new RegionStateNode(regionInfo, regionInTransition));
+ return regionsMap.computeIfAbsent(regionInfo.getRegionName(), key -> {
+ final RegionStateNode node = new RegionStateNode(regionInfo, regionInTransition);
+ encodedRegionsMap.putIfAbsent(regionInfo.getEncodedName(), node);
+ return node;
+ });
}
public RegionStateNode getOrCreateRegionStateNode(RegionInfo regionInfo) {
@@ -132,6 +143,7 @@ public class RegionStates {
public void deleteRegion(final RegionInfo regionInfo) {
regionsMap.remove(regionInfo.getRegionName());
+ encodedRegionsMap.remove(regionInfo.getEncodedName());
// See HBASE-20860
// After master restarts, merged regions' RIT state may not be cleaned,
// making sure they are cleaned here
@@ -199,13 +211,11 @@ public class RegionStates {
}
public RegionState getRegionState(final String encodedRegionName) {
- // TODO: Need a map <encodedName, ...> but it is just dispatch merge...
- for (RegionStateNode node : regionsMap.values()) {
- if (node.getRegionInfo().getEncodedName().equals(encodedRegionName)) {
- return node.toRegionState();
- }
+ final RegionStateNode node = encodedRegionsMap.get(encodedRegionName);
+ if (node == null) {
+ return null;
}
- return null;
+ return node.toRegionState();
}
// ============================================================================================