From 886ee7cc88efa825352e5711595c3dba914aecc5 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Wed, 3 Feb 2016 13:38:53 -0800 Subject: [PATCH] HBASE-15211 Don't run the CatalogJanitor if there are regions in transition --- .../main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 d02e5ae..b9abc65 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 @@ -96,7 +96,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."); -- 2.7.0