You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2016/02/04 17:52:45 UTC
hbase git commit: HBASE-15211 Don't run the CatalogJanitor if there
are regions in transition
Repository: hbase
Updated Branches:
refs/heads/branch-1.2 1ec438b64 -> faff18fba
HBASE-15211 Don't run the CatalogJanitor if there are regions in transition
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/faff18fb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/faff18fb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/faff18fb
Branch: refs/heads/branch-1.2
Commit: faff18fbaa219127dc27eb982622bcb419019249
Parents: 1ec438b
Author: Elliott Clark <ec...@apache.org>
Authored: Wed Feb 3 13:38:53 2016 -0800
Committer: Elliott Clark <ec...@apache.org>
Committed: Thu Feb 4 08:52:28 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/master/CatalogJanitor.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/faff18fb/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 6db7802..d43e71a 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
@@ -98,7 +98,11 @@ public class CatalogJanitor extends ScheduledChore {
@Override
protected void chore() {
try {
- if (this.enabled.get()) {
+ AssignmentManager am = this.services.getAssignmentManager();
+ if (this.enabled.get()
+ && am != null
+ && am.isFailoverCleanupDone()
+ && am.getRegionStates().getRegionsInTransition().size() == 0) {
scan();
} else {
LOG.warn("CatalogJanitor disabled! Not running scan.");