You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2020/10/15 14:07:12 UTC
[hbase] branch branch-2 updated: HBASE-24628 Region normalizer now
respects a rate limit (HMaster chore shutdown NPE ADDENDUM) (#2540)
This is an automated email from the ASF dual-hosted git repository.
zhangduo 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 fc4957f HBASE-24628 Region normalizer now respects a rate limit (HMaster chore shutdown NPE ADDENDUM) (#2540)
fc4957f is described below
commit fc4957f4567ef21e76f56cd100e485cb15742335
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Thu Oct 15 07:02:53 2020 -0700
HBASE-24628 Region normalizer now respects a rate limit (HMaster chore shutdown NPE ADDENDUM) (#2540)
Signed-off-by: Michael Stack <st...@apache.org>
Signed-off-by: Duo Zhang <zh...@apache.org>
---
.../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index ff242df..461601a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1097,7 +1097,9 @@ public class HMaster extends HRegionServer implements MasterServices {
getChoreService().scheduleChore(clusterStatusChore);
this.balancerChore = new BalancerChore(this);
getChoreService().scheduleChore(balancerChore);
- getChoreService().scheduleChore(regionNormalizerManager.getRegionNormalizerChore());
+ if (regionNormalizerManager != null) {
+ getChoreService().scheduleChore(regionNormalizerManager.getRegionNormalizerChore());
+ }
this.catalogJanitorChore = new CatalogJanitor(this);
getChoreService().scheduleChore(catalogJanitorChore);
this.hbckChore = new HbckChore(this);
@@ -1612,7 +1614,9 @@ public class HMaster extends HRegionServer implements MasterServices {
choreService.cancelChore(this.expiredMobFileCleanerChore);
choreService.cancelChore(this.mobCompactChore);
choreService.cancelChore(this.balancerChore);
- choreService.cancelChore(getRegionNormalizerManager().getRegionNormalizerChore());
+ if (regionNormalizerManager != null) {
+ choreService.cancelChore(regionNormalizerManager.getRegionNormalizerChore());
+ }
choreService.cancelChore(this.clusterStatusChore);
choreService.cancelChore(this.catalogJanitorChore);
choreService.cancelChore(this.clusterStatusPublisherChore);