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 ef2a005..cdfe3d7 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 @@ -214,6 +214,7 @@ public class CatalogJanitor extends ScheduledChore { int scan() throws IOException { try { if (!alreadyRunning.compareAndSet(false, true)) { + LOG.debug("CatalogJanitor already running"); return 0; } Triple, Map> scanTriple = @@ -266,8 +267,8 @@ public class CatalogJanitor extends ScheduledChore { LOG.info("Scanned " + count + " catalog row(s), gc'd " + mergeCleaned + " unreferenced merged region(s) and " + splitCleaned + " unreferenced parent region(s)"); - } else if (LOG.isTraceEnabled()) { - LOG.trace("Scanned " + count + " catalog row(s), gc'd " + mergeCleaned + } else if (LOG.isDebugEnabled()) { + LOG.debug("Scanned " + count + " catalog row(s), gc'd " + mergeCleaned + " unreferenced merged region(s) and " + splitCleaned + " unreferenced parent region(s)"); } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java index 44b24ce..fd9a90f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java @@ -268,8 +268,8 @@ public class TestRegionMergeTransactionOnCluster { cleaner.chore(); Thread.sleep(1000); } - int newcount1 = 0; while (System.currentTimeMillis() < timeout) { + int newcount1 = 0; for(HColumnDescriptor colFamily : columnFamilies) { newcount1 += hrfs.getStoreFiles(colFamily.getName()).size(); }