You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2019/09/09 16:32:55 UTC

[hbase] branch branch-2.1 updated: HBASE-22859 [HBCK2] Fix the orphan regions on filesystem Backport of above; only the usage message was changed in the backport; nothing else. Usage points at refguide. Signed-off-by: Peter Somogyi Signed-off-by: Guanghao Zhang

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 7d90ff0  HBASE-22859 [HBCK2] Fix the orphan regions on filesystem Backport of above; only the usage message was changed in the backport; nothing else. Usage points at refguide. Signed-off-by: Peter Somogyi <ps...@apache.org> Signed-off-by: Guanghao Zhang <zg...@apache.org>
7d90ff0 is described below

commit 7d90ff088b54e5b59145ba63c3f84d51c8565094
Author: stack <st...@apache.org>
AuthorDate: Mon Sep 9 09:30:34 2019 -0700

    HBASE-22859 [HBCK2] Fix the orphan regions on filesystem
    Backport of above; only the usage message was changed
    in the backport; nothing else. Usage points at refguide.
    Signed-off-by: Peter Somogyi <ps...@apache.org>
    Signed-off-by: Guanghao Zhang <zg...@apache.org>
---
 .../hadoop/hbase/tool/LoadIncrementalHFiles.java   | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java
index 1896883..e4d5dcb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/LoadIncrementalHFiles.java
@@ -184,16 +184,19 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
   }
 
   private void usage() {
-    System.err.println("usage: " + "bin/hbase completebulkload <-Dargs> "
-      + "</path/to/hfileoutputformat-output> <tablename>\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");
+    System.err.println("Usage: " + "bin/hbase completebulkload [OPTIONS] "
+        + "</PATH/TO/HFILEOUTPUTFORMAT-OUTPUT> <TABLENAME>\n"
+        + "Loads directory of hfiles -- a region dir or product of HFileOutputFormat -- "
+        + "into an hbase table.\n"
+        + "OPTIONS (for other -D options, see source code):\n"
+        + " -D" + CREATE_TABLE_CONF_KEY + "=no whether to create table; when 'no', target "
+        + "table must exist.\n"
+        + " -D" + IGNORE_UNMATCHED_CF_CONF_KEY + "=yes to ignore unmatched column families.\n"
+        + " -loadTable for when directory of files to load has a depth of 3; target table must "
+        + "exist;\n"
+        + " must be last of the options on command line.\n"
+        + "See http://hbase.apache.org/book.html#arch.bulk.load.complete.strays for "
+        + "documentation.\n");
   }
 
   /**