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 2021/03/25 02:11:51 UTC
[hbase] branch branch-2 updated: HBASE-25693 NPE getting metrics
from standby masters (MetricsMasterWrapperImpl.getMergePlanCount) (#3091)
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 124ea5e HBASE-25693 NPE getting metrics from standby masters (MetricsMasterWrapperImpl.getMergePlanCount) (#3091)
124ea5e is described below
commit 124ea5eee327643fd23104915d9844a3c9365366
Author: Andrew Purtell <ap...@apache.org>
AuthorDate: Wed Mar 24 19:09:10 2021 -0700
HBASE-25693 NPE getting metrics from standby masters (MetricsMasterWrapperImpl.getMergePlanCount) (#3091)
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Nick Dimiduk <nd...@apache.org>
---
.../org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java
index 1bc5dd4..c4e1a2e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java
@@ -50,11 +50,17 @@ public class MetricsMasterWrapperImpl implements MetricsMasterWrapper {
@Override
public long getSplitPlanCount() {
+ if (master.getRegionNormalizerManager() == null) {
+ return 0;
+ }
return master.getRegionNormalizerManager().getSplitPlanCount();
}
@Override
public long getMergePlanCount() {
+ if (master.getRegionNormalizerManager() == null) {
+ return 0;
+ }
return master.getRegionNormalizerManager().getMergePlanCount();
}