From ea55e749c5967382006a77210df70013317b5978 Mon Sep 17 00:00:00 2001 From: Murtaza Hassan Date: Wed, 7 Aug 2019 11:43:16 +0200 Subject: [PATCH 1/2] HBASE-22812 InterfaceAudience annotation in CatalogJanitor uses fully-qualified name --- .../java/org/apache/hadoop/hbase/master/CatalogJanitor.java | 3 ++- 1 file changed, 2 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 192bc847948c..2722af0651bb 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 @@ -63,6 +63,7 @@ import org.apache.hadoop.hbase.util.PairOfSameType; import org.apache.hadoop.hbase.util.Threads; import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,7 +78,7 @@ // TODO: Only works with single hbase:meta region currently. Fix. // TODO: Should it start over every time? Could it continue if runs into problem? Only if // problem does not mess up 'results'. -@org.apache.yetus.audience.InterfaceAudience.Private +@InterfaceAudience.Private public class CatalogJanitor extends ScheduledChore { private static final Logger LOG = LoggerFactory.getLogger(CatalogJanitor.class.getName()); private final AtomicBoolean alreadyRunning = new AtomicBoolean(false); From 1018b77222a9f86f101883038912f707157a28c2 Mon Sep 17 00:00:00 2001 From: Murtaza Hassan Date: Wed, 7 Aug 2019 19:06:26 +0200 Subject: [PATCH 2/2] HBASE-22812 changed import order --- .../java/org/apache/hadoop/hbase/master/CatalogJanitor.java | 3 ++- 1 file changed, 2 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 2722af0651bb..e5537fb430a0 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 @@ -62,11 +62,12 @@ import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.PairOfSameType; import org.apache.hadoop.hbase.util.Threads; -import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; + /** * A janitor for the catalog tables. Scans the hbase:meta catalog * table on a period. Makes a lastReport on state of hbase:meta. Looks for unused