From bab947ff14a17a003a3cc4d27b97aab856c5d637 Mon Sep 17 00:00:00 2001 From: Artem Ervits Date: Fri, 30 Nov 2018 15:16:39 -0500 Subject: [PATCH] HBASE-21536 Fix completebulkload usage instructions --- .../hadoop/hbase/tool/LoadIncrementalHFiles.java | 19 +++++++++++-------- src/main/asciidoc/_chapters/ops_mgt.adoc | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java index e027ac68c3..e879b47020 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java @@ -112,7 +112,6 @@ public class LoadIncrementalHFiles extends Configured implements Tool { private static final Logger LOG = LoggerFactory.getLogger(LoadIncrementalHFiles.class); - public static final String NAME = "completebulkload"; static final String RETRY_ON_IO_EXCEPTION = "hbase.bulkload.retries.retryOnIOException"; public static final String MAX_FILES_PER_REGION_PER_FAMILY = "hbase.mapreduce.bulkload.max.hfiles.perRegion.perFamily"; @@ -184,13 +183,17 @@ public class LoadIncrementalHFiles extends Configured implements Tool { } private void usage() { - System.err.println("usage: " + NAME + " /path/to/hfileoutputformat-output tablename -loadTable" - + "\n -D" + CREATE_TABLE_CONF_KEY + "=no - can be used to avoid creation of table by " - + "this tool\n Note: if you set this to 'no', then the target table must already exist " - + "in HBase\n -loadTable implies your baseDirectory to store file has a depth of 3 ,you" - + " must have an existing table\n-D" + IGNORE_UNMATCHED_CF_CONF_KEY + "=yes - can be used " - + "to ignore unmatched column families\n" + - "\n"); + System.err.println("usage: " + "bin/hbase " + + "org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles <-Dargs> " + + " \n" + + "\t-D" + CREATE_TABLE_CONF_KEY + "=no can be used to avoid creation " + + "of a table by this tool.\n" + + "\t Note: if you set this to 'no', then target table must already exist.\n" + + "\t-D" + IGNORE_UNMATCHED_CF_CONF_KEY + "=yes can be used to ignore " + + "unmatched column families.\n" + + "\t-loadTable switch implies your baseDirectory to store file has a " + + "depth of 3, table must exist\n" + + "\t and -loadTable switch is the last option on the command line.\n\n"); } /** diff --git src/main/asciidoc/_chapters/ops_mgt.adoc src/main/asciidoc/_chapters/ops_mgt.adoc index f2ee1cc7db..b91db72596 100644 --- src/main/asciidoc/_chapters/ops_mgt.adoc +++ src/main/asciidoc/_chapters/ops_mgt.adoc @@ -838,7 +838,7 @@ $ bin/hbase org.apache.hadoop.hbase.tool.LoadIncrementalHFiles +HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-mapreduce-VERSION.jar completebulkload ---- [[completebulkload.warning]] -- 2.16.2