You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by vj...@apache.org on 2021/01/26 06:29:41 UTC
[hbase] branch branch-2.3 updated: HBASE-25523 Region normalizer
chore thread is getting killed (#2903)
This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new 7ee450f HBASE-25523 Region normalizer chore thread is getting killed (#2903)
7ee450f is described below
commit 7ee450fa6423303b6cfd7ae2b3f2fb77b40d7d04
Author: Aman Poonia <ap...@salesforce.com>
AuthorDate: Tue Jan 26 11:55:12 2021 +0530
HBASE-25523 Region normalizer chore thread is getting killed (#2903)
Signed-off-by: Bharath Vissapragada <bh...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../hbase/master/normalizer/SimpleRegionNormalizer.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
index a904e17..e547732 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
@@ -28,6 +28,7 @@ import java.util.function.BooleanSupplier;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.RegionMetrics;
+import org.apache.hadoop.hbase.ServerMetrics;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.Size;
import org.apache.hadoop.hbase.TableName;
@@ -256,8 +257,16 @@ public class SimpleRegionNormalizer implements RegionNormalizer {
private long getRegionSizeMB(RegionInfo hri) {
ServerName sn =
masterServices.getAssignmentManager().getRegionStates().getRegionServerOfRegion(hri);
- RegionMetrics regionLoad =
- masterServices.getServerManager().getLoad(sn).getRegionMetrics().get(hri.getRegionName());
+ if (sn == null) {
+ LOG.debug("{} region was not found on any Server", hri.getRegionNameAsString());
+ return -1;
+ }
+ ServerMetrics serverMetrics = masterServices.getServerManager().getLoad(sn);
+ if (serverMetrics == null) {
+ LOG.debug("server {} was not found in ServerManager", sn.getServerName());
+ return -1;
+ }
+ RegionMetrics regionLoad = serverMetrics.getRegionMetrics().get(hri.getRegionName());
if (regionLoad == null) {
LOG.debug("{} was not found in RegionsLoad", hri.getRegionNameAsString());
return -1;