You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/10/23 21:43:58 UTC
hbase git commit: HBASE-21349 Do not run CatalogJanitor or Nomalizer
when cluster is shutting down
Repository: hbase
Updated Branches:
refs/heads/branch-2.0 8a04d444d -> 98861c0f9
HBASE-21349 Do not run CatalogJanitor or Nomalizer when cluster is shutting down
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/98861c0f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/98861c0f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/98861c0f
Branch: refs/heads/branch-2.0
Commit: 98861c0f9bb456cc0392e5b9de6a7e783259b698
Parents: 8a04d44
Author: xcang <xc...@salesforce.com>
Authored: Mon Oct 22 23:16:52 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Tue Oct 23 14:43:45 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/98861c0f/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/98861c0f/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 3b3759f..5e10964 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
@@ -1687,12 +1687,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;