From dad2c1036f7a95c2e26b4ebac5001fe2410972d1 Mon Sep 17 00:00:00 2001 From: Guangxu Cheng Date: Mon, 7 May 2018 16:24:47 +0800 Subject: [PATCH] HBASE-18812 Recategorize some of classes used as tools --- .../src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java | 3 ++- .../src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java | 3 ++- .../hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.java | 3 ++- .../src/main/java/org/apache/hadoop/hbase/coprocessor/Export.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java | 3 ++- .../main/java/org/apache/hadoop/hbase/mapreduce/SampleUploader.java | 3 ++- .../apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/mapreduce/HashTable.java | 3 ++- .../src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java | 3 ++- .../apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java | 3 ++- .../procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java | 3 +++ .../hbase/procedure2/store/wal/ProcedureWALPerformanceEvaluation.java | 3 +++ .../main/java/org/apache/hadoop/hbase/mob/ExpiredMobFileCleaner.java | 3 ++- .../main/java/org/apache/hadoop/hbase/regionserver/wal/Compressor.java | 3 ++- .../hadoop/hbase/replication/regionserver/DumpReplicationQueues.java | 3 ++- .../hadoop/hbase/replication/regionserver/ReplicationSyncUp.java | 3 ++- .../src/main/java/org/apache/hadoop/hbase/snapshot/CreateSnapshot.java | 3 ++- hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java | 3 ++- .../src/main/java/org/apache/hadoop/hbase/util/ServerCommandLine.java | 3 ++- .../procedure/MasterProcedureSchedulerPerformanceEvaluation.java | 3 +++ .../java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java | 3 ++- .../src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java | 3 ++- 22 files changed, 45 insertions(+), 19 deletions(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java index 8baf2f0b32..6bd4bc107b 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java @@ -40,6 +40,7 @@ import java.net.URI; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.backup.BackupRestoreConstants.BackupCommand; import org.apache.hadoop.hbase.backup.impl.BackupCommands; import org.apache.hadoop.hbase.backup.impl.BackupManager; @@ -59,7 +60,7 @@ import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine; * Command-line entry point for backup operation * */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class BackupDriver extends AbstractHBaseTool { private static final Logger LOG = LoggerFactory.getLogger(BackupDriver.class); diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java index 4e9056314c..0e5c257f88 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java @@ -40,6 +40,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl; import org.apache.hadoop.hbase.backup.impl.BackupManager; @@ -64,7 +65,7 @@ import org.apache.hbase.thirdparty.org.apache.commons.cli.HelpFormatter; * Command-line entry point for restore operation * */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class RestoreDriver extends AbstractHBaseTool { private static final Logger LOG = LoggerFactory.getLogger(RestoreDriver.class); private CommandLine cmd; diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.java index 1a3c46528a..fb73313c30 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.java @@ -25,6 +25,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; @@ -52,7 +53,7 @@ import org.slf4j.LoggerFactory; * A tool to split HFiles into new region boundaries as a MapReduce job. The tool generates HFiles * for later bulk importing. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class MapReduceHFileSplitterJob extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(MapReduceHFileSplitterJob.class); final static String NAME = "HFileSplitterJob"; diff --git a/hbase-endpoint/src/main/java/org/apache/hadoop/hbase/coprocessor/Export.java b/hbase-endpoint/src/main/java/org/apache/hadoop/hbase/coprocessor/Export.java index 12b8b8e58c..9a90c99f07 100644 --- a/hbase-endpoint/src/main/java/org/apache/hadoop/hbase/coprocessor/Export.java +++ b/hbase-endpoint/src/main/java/org/apache/hadoop/hbase/coprocessor/Export.java @@ -88,7 +88,7 @@ import com.google.protobuf.Service; * * @see org.apache.hadoop.hbase.mapreduce.Export */ -@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) +@InterfaceAudience.LimitedPrivate({HBaseInterfaceAudience.COPROC, HBaseInterfaceAudience.TOOLS}) @InterfaceStability.Evolving public class Export extends ExportProtos.ExportService implements RegionCoprocessor { diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java index 3098ac250f..8c0095e212 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/IndexBuilder.java @@ -23,6 +23,7 @@ import java.util.TreeMap; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; @@ -64,7 +65,7 @@ import org.apache.yetus.audience.InterfaceAudience; * This code was written against HBase 0.21 trunk. *

*/ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class IndexBuilder extends Configured implements Tool { /** the column family containing the indexed row key */ public static final byte[] INDEX_COLUMN = Bytes.toBytes("INDEX"); diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/SampleUploader.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/SampleUploader.java index 1248f874dd..9f3485f06c 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/SampleUploader.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/mapreduce/SampleUploader.java @@ -23,6 +23,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.util.Bytes; @@ -58,7 +59,7 @@ import org.apache.yetus.audience.InterfaceAudience; *

* This code was written against HBase 0.21 trunk. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class SampleUploader extends Configured implements Tool { private static final String NAME = "SampleUploader"; diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java index 86ccfc602e..0a7106e658 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java @@ -46,7 +46,7 @@ import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine; /** * A perf test which does large data ingestion using stripe compactions and regular compactions. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class StripeCompactionsPerformanceEvaluation extends AbstractHBaseTool { private static final Logger LOG = LoggerFactory.getLogger(StripeCompactionsPerformanceEvaluation.class); diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HashTable.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HashTable.java index b67225e70d..e621428b9e 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HashTable.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HashTable.java @@ -33,6 +33,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Connection; @@ -61,7 +62,7 @@ import org.apache.hbase.thirdparty.com.google.common.base.Charsets; import org.apache.hbase.thirdparty.com.google.common.base.Throwables; import org.apache.hbase.thirdparty.com.google.common.collect.Ordering; -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class HashTable extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(HashTable.class); diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java index 32b7561dda..d3775a6004 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java @@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; @@ -53,7 +54,7 @@ import org.slf4j.LoggerFactory; import org.apache.hbase.thirdparty.com.google.common.base.Throwables; -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class SyncTable extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(SyncTable.class); diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java index 85eebc50bd..d01a047edc 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java @@ -27,6 +27,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Connection; @@ -80,7 +81,7 @@ import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesti * Two counters are provided, Verifier.Counters.GOODROWS and BADROWS. The reason * for a why a row is different is shown in the map's log. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class VerifyReplication extends Configured implements Tool { private static final Logger LOG = diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java index 23728792ed..3e008a6a8f 100644 --- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java +++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java @@ -29,6 +29,7 @@ import java.util.Set; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseCommonTestingUtility; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility; import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.TestProcedure; import org.apache.hadoop.hbase.procedure2.store.ProcedureStore; @@ -38,9 +39,11 @@ import org.apache.hadoop.hbase.util.AbstractHBaseTool; import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine; import org.apache.hbase.thirdparty.org.apache.commons.cli.Option; +import org.apache.yetus.audience.InterfaceAudience; import static java.lang.System.currentTimeMillis; +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class ProcedureWALLoaderPerformanceEvaluation extends AbstractHBaseTool { protected static final HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility(); diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPerformanceEvaluation.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPerformanceEvaluation.java index f37ccb32c0..5f0502bde3 100644 --- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPerformanceEvaluation.java +++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALPerformanceEvaluation.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.hadoop.fs.*; import org.apache.hadoop.conf.*; import org.apache.hadoop.hbase.HBaseCommonTestingUtility; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility; import org.apache.hadoop.hbase.procedure2.util.*; @@ -37,7 +38,9 @@ import org.apache.hadoop.hbase.util.AbstractHBaseTool; import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine; import org.apache.hbase.thirdparty.org.apache.commons.cli.Option; +import org.apache.yetus.audience.InterfaceAudience; +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class ProcedureWALPerformanceEvaluation extends AbstractHBaseTool { protected static final HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/ExpiredMobFileCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/ExpiredMobFileCleaner.java index 120f11e65a..bfa974f6f9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/ExpiredMobFileCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/ExpiredMobFileCleaner.java @@ -24,6 +24,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; import org.apache.yetus.audience.InterfaceAudience; @@ -44,7 +45,7 @@ import org.apache.hadoop.util.ToolRunner; /** * The cleaner to delete the expired MOB files. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class ExpiredMobFileCleaner extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(ExpiredMobFileCleaner.class); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Compressor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Compressor.java index 13f5d6ef35..bb2f82f117 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Compressor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/Compressor.java @@ -21,6 +21,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -41,7 +42,7 @@ import org.apache.hadoop.hbase.wal.WALProvider; * A set of static functions for running our custom WAL compression/decompression. * Also contains a command line tool to compress and uncompress WALs. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class Compressor { /** * Command line tool to compress and uncompress WALs. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/DumpReplicationQueues.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/DumpReplicationQueues.java index a960c3146a..df37aa8c46 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/DumpReplicationQueues.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/DumpReplicationQueues.java @@ -34,6 +34,7 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.Stoppable; import org.apache.hadoop.hbase.client.Admin; @@ -67,7 +68,7 @@ import org.apache.hbase.thirdparty.com.google.common.util.concurrent.AtomicLongM * Arguments: --distributed Polls each RS to dump information about the queue * --hdfs Reports HDFS usage by the replication queues (note: can be overestimated). */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class DumpReplicationQueues extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(DumpReplicationQueues.class.getName()); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java index 62068fdd3e..558e57b967 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java @@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.ChoreService; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; @@ -48,7 +49,7 @@ import org.apache.yetus.audience.InterfaceAudience; * hbase org.apache.hadoop.hbase.replication.regionserver.ReplicationSyncUp * */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class ReplicationSyncUp extends Configured implements Tool { private static final long SLEEP_TIME = 10000; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/CreateSnapshot.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/CreateSnapshot.java index d0fc80337f..6814618d52 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/CreateSnapshot.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/CreateSnapshot.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.snapshot; import java.util.Arrays; import java.util.Locale; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; @@ -35,7 +36,7 @@ import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine; /** * This is a command line class that will snapshot a given table. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class CreateSnapshot extends AbstractHBaseTool { private SnapshotType snapshotType = SnapshotType.FLUSH; private TableName tableName = null; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java index ae6324f71b..4b9eee0d6c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java @@ -55,6 +55,7 @@ import org.apache.hadoop.hbase.ClusterMetrics; import org.apache.hadoop.hbase.ClusterMetrics.Option; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionLocation; @@ -114,7 +115,7 @@ import org.apache.hbase.thirdparty.com.google.common.collect.Lists; * 3. zookeeper mode - for each zookeeper instance, selects a zNode and * outputs some information about failure or latency. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public final class Canary implements Tool { // Sink interface used by the canary to outputs information public interface Sink { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerCommandLine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerCommandLine.java index f99a0908cd..00cb3c3a5b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerCommandLine.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ServerCommandLine.java @@ -26,6 +26,7 @@ import java.util.Locale; import java.util.Map.Entry; import java.util.Set; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; @@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory; /** * Base class for command lines that start up various HBase daemons. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public abstract class ServerCommandLine extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(ServerCommandLine.class); @SuppressWarnings("serial") diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureSchedulerPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureSchedulerPerformanceEvaluation.java index 767f30fe28..8dafd0ec32 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureSchedulerPerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureSchedulerPerformanceEvaluation.java @@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.Random; import org.apache.commons.lang3.ArrayUtils; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.TableName; @@ -33,6 +34,7 @@ import org.apache.hadoop.hbase.util.AbstractHBaseTool; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine; import org.apache.hbase.thirdparty.org.apache.commons.cli.Option; +import org.apache.yetus.audience.InterfaceAudience; /** * Tool to test performance of locks and queues in procedure scheduler independently from other @@ -40,6 +42,7 @@ import org.apache.hbase.thirdparty.org.apache.commons.cli.Option; * Inserts table and region operations in the scheduler, then polls them and exercises their locks * Number of tables, regions and operations can be set using cli args. */ +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class MasterProcedureSchedulerPerformanceEvaluation extends AbstractHBaseTool { protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java index 9a8bddfc92..3cd3b81fd9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java @@ -43,6 +43,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.MockRegionServerServices; @@ -84,7 +85,7 @@ import org.slf4j.LoggerFactory; * See usage for this tool by running: * $ hbase org.apache.hadoop.hbase.wal.WALPerformanceEvaluation -h */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public final class WALPerformanceEvaluation extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(WALPerformanceEvaluation.class); diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java index 50a6f5e78f..5dc89034da 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; import org.apache.yetus.audience.InterfaceAudience; @@ -42,7 +43,7 @@ import org.slf4j.LoggerFactory; * * Use -set-acls to set the ACLs, no option to erase ACLs */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class ZKAclReset extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(ZKAclReset.class); -- 2.13