HBASE-24628 Region normalizer now respects a rate limit (HMaster chore shutdown NPE ADDENDUM) (#2540)
Signed-off-by: Michael Stack <stack@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
parent
2f566dc234
commit
fc4957f456
|
@ -1097,7 +1097,9 @@ public class HMaster extends HRegionServer implements MasterServices {
|
||||||
getChoreService().scheduleChore(clusterStatusChore);
|
getChoreService().scheduleChore(clusterStatusChore);
|
||||||
this.balancerChore = new BalancerChore(this);
|
this.balancerChore = new BalancerChore(this);
|
||||||
getChoreService().scheduleChore(balancerChore);
|
getChoreService().scheduleChore(balancerChore);
|
||||||
getChoreService().scheduleChore(regionNormalizerManager.getRegionNormalizerChore());
|
if (regionNormalizerManager != null) {
|
||||||
|
getChoreService().scheduleChore(regionNormalizerManager.getRegionNormalizerChore());
|
||||||
|
}
|
||||||
this.catalogJanitorChore = new CatalogJanitor(this);
|
this.catalogJanitorChore = new CatalogJanitor(this);
|
||||||
getChoreService().scheduleChore(catalogJanitorChore);
|
getChoreService().scheduleChore(catalogJanitorChore);
|
||||||
this.hbckChore = new HbckChore(this);
|
this.hbckChore = new HbckChore(this);
|
||||||
|
@ -1612,7 +1614,9 @@ public class HMaster extends HRegionServer implements MasterServices {
|
||||||
choreService.cancelChore(this.expiredMobFileCleanerChore);
|
choreService.cancelChore(this.expiredMobFileCleanerChore);
|
||||||
choreService.cancelChore(this.mobCompactChore);
|
choreService.cancelChore(this.mobCompactChore);
|
||||||
choreService.cancelChore(this.balancerChore);
|
choreService.cancelChore(this.balancerChore);
|
||||||
choreService.cancelChore(getRegionNormalizerManager().getRegionNormalizerChore());
|
if (regionNormalizerManager != null) {
|
||||||
|
choreService.cancelChore(regionNormalizerManager.getRegionNormalizerChore());
|
||||||
|
}
|
||||||
choreService.cancelChore(this.clusterStatusChore);
|
choreService.cancelChore(this.clusterStatusChore);
|
||||||
choreService.cancelChore(this.catalogJanitorChore);
|
choreService.cancelChore(this.catalogJanitorChore);
|
||||||
choreService.cancelChore(this.clusterStatusPublisherChore);
|
choreService.cancelChore(this.clusterStatusPublisherChore);
|
||||||
|
|
Loading…
Reference in New Issue