Repository: hbase Updated Branches: refs/heads/master 1e9d99872 -> 1f437ac22
HBASE-21349 Do not run CatalogJanitor or Nomalizer when cluster is shutting down Signed-off-by: Michael Stack <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1f437ac2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1f437ac2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1f437ac2 Branch: refs/heads/master Commit: 1f437ac221dac36d269f9bf500b3f491c465ae7a Parents: 1e9d998 Author: xcang <[email protected]> Authored: Mon Oct 22 23:16:52 2018 -0700 Committer: Michael Stack <[email protected]> Committed: Tue Oct 23 14:45:05 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/master/CatalogJanitor.java | 6 ++++-- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1f437ac2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java index 8515093..73fabf8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java @@ -111,14 +111,16 @@ public class CatalogJanitor extends ScheduledChore { protected void chore() { try { AssignmentManager am = this.services.getAssignmentManager(); - if (this.enabled.get() && !this.services.isInMaintenanceMode() && am != null && + if (this.enabled.get() && !this.services.isInMaintenanceMode() && + !this.services.getServerManager().isClusterShutdown() && am != null && am.isMetaLoaded() && !am.hasRegionsInTransition()) { scan(); } else { LOG.warn("CatalogJanitor is disabled! Enabled=" + this.enabled.get() + ", maintenanceMode=" + this.services.isInMaintenanceMode() + ", am=" + am + ", metaLoaded=" + (am != null && am.isMetaLoaded()) + ", hasRIT=" + - (am != null && am.hasRegionsInTransition())); + (am != null && am.hasRegionsInTransition()) + " clusterShutDown=" + this.services + .getServerManager().isClusterShutdown()); } } catch (IOException e) { LOG.warn("Failed scan of catalog table", e); http://git-wip-us.apache.org/repos/asf/hbase/blob/1f437ac2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- 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 90e0e6c..8eaa87d 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 @@ -1781,12 +1781,14 @@ public class HMaster extends HRegionServer implements MasterServices { LOG.debug("Master has not been initialized, don't run region normalizer."); return false; } - + if (this.getServerManager().isClusterShutdown()) { + LOG.info("Cluster is shutting down, don't run region normalizer."); + return false; + } if (isInMaintenanceMode()) { LOG.info("Master is in maintenance mode, don't run region normalizer."); return false; } - if (!this.regionNormalizerTracker.isNormalizerOn()) { LOG.debug("Region normalization is disabled, don't run region normalizer."); return false;
