[hbase] branch master updated: HBASE-23817 The message "Please make sure that backup is enabled on the cluster." is shown even when the backup feature is enabled (#3427)

[weichiu]

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

weichiu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 79659d8  HBASE-23817 The message "Please make sure that backup is 
enabled on the cluster." is shown even when the backup feature is enabled 
(#3427)
79659d8 is described below

commit 79659d8e66a4c6644fa26bc1523a74bf88356882
Author: Wei-Chiu Chuang <weic...@apache.org>
AuthorDate: Tue Jun 29 02:19:32 2021 -0700

    HBASE-23817 The message "Please make sure that backup is enabled on the 
cluster." is shown even when the backup feature is enabled (#3427)
    
    Signed-off-by: Toshihiro Suzuki <brfrn...@gmail.com>
---
 .../src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java  | 3 +--
 .../java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java | 6 +++---
 .../src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java | 3 +--
 3 files changed, 5 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 12b8293..7889f6c 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
@@ -85,8 +85,6 @@ public class BackupDriver extends AbstractHBaseTool {
       return -1;
     }
 
-    System.out.println(BackupRestoreConstants.VERIFY_BACKUP);
-
     String cmd = null;
     String[] remainArgs = null;
     if (args == null || args.length == 0) {
@@ -210,5 +208,6 @@ public class BackupDriver extends AbstractHBaseTool {
 
   protected void printToolUsage() throws IOException {
     System.out.println(BackupCommands.USAGE);
+    System.out.println(BackupRestoreConstants.VERIFY_BACKUP);
   }
 }
diff --git 
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java
 
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java
index 16ec3d2..0e0b90c 100644
--- 
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java
+++ 
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java
@@ -105,13 +105,13 @@ public interface BackupRestoreConstants {
           + 
"org.apache.hadoop.hbase.backup.regionserver.LogRollRegionServerProcedureManager\n"
           + "hbase.coprocessor.region.classes=YOUR_CLASSES,"
           + "org.apache.hadoop.hbase.backup.BackupObserver\n"
-          + "and restart the cluster\n";
+          + "and restart the cluster\n"
+          + "For more information please see 
http://hbase.apache.org/book.html#backuprestore\n";;
   String ENABLE_BACKUP = "Backup is not enabled. To enable backup, "+
       "in hbase-site.xml, set:\n "
       + BACKUP_CONFIG_STRING;
 
-  String VERIFY_BACKUP = "Please make sure that backup is enabled on the 
cluster. To enable "
-          + "backup, in hbase-site.xml, set:\n " + BACKUP_CONFIG_STRING;
+  String VERIFY_BACKUP = "To enable backup, in hbase-site.xml, set:\n " + 
BACKUP_CONFIG_STRING;
 
   /*
    *  Delimiter in table name list in restore command
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 2399385..4338158 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
@@ -92,8 +92,6 @@ public class RestoreDriver extends AbstractHBaseTool {
       return -1;
     }
 
-    System.out.println(BackupRestoreConstants.VERIFY_BACKUP);
-
     // enable debug logging
     if (cmd.hasOption(OPTION_DEBUG)) {
       Log4jUtils.setLogLevel("org.apache.hadoop.hbase.backup", "DEBUG");
@@ -269,5 +267,6 @@ public class RestoreDriver extends AbstractHBaseTool {
     helpFormatter.setWidth(100);
     helpFormatter.setSyntaxPrefix("Options:");
     helpFormatter.printHelp(" ", null, options, USAGE_FOOTER);
+    System.out.println(BackupRestoreConstants.VERIFY_BACKUP);
   }
 }