From 23796e6b901bf397467d3a65ee5e8e2d4493e082 Mon Sep 17 00:00:00 2001 From: Guangxu Cheng Date: Fri, 11 May 2018 10:57:15 +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 ++- .../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/HBaseConfTool.java | 3 ++- .../src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java | 3 ++- .../src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAclReset.java | 3 ++- 7 files changed, 14 insertions(+), 7 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-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/HBaseConfTool.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseConfTool.java index 44dd9776d3..1efde12614 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseConfTool.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseConfTool.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.util; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; @@ -27,7 +28,7 @@ import org.apache.hadoop.hbase.HBaseConfiguration; * Tool that prints out a configuration. * Pass the configuration key on the command-line. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class HBaseConfTool { public static void main(String args[]) { if (args.length < 1) { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java index 1b58634807..cd842108fb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java @@ -38,6 +38,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.ClusterMetrics; import org.apache.hadoop.hbase.ClusterMetrics.Option; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; @@ -142,7 +143,7 @@ import org.apache.hbase.thirdparty.org.apache.commons.cli.ParseException; * grows too large, use this script to perform a network IO safe rolling split * of all regions. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS) public class RegionSplitter { private static final Logger LOG = LoggerFactory.getLogger(RegionSplitter.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.0