From 32f7bfb34502a22a3aebe08c5e2162db7685d064 Mon Sep 17 00:00:00 2001 From: Dieter De Paepe Date: Wed, 28 Feb 2024 18:07:02 +0100 Subject: [PATCH 1/2] HBASE-28408 Rephrase confusing log message Assume a user has a series of backups: Full1, Inc2, Inc3, where a table has not changed between Full1 and Inc3, but has changed after Inc3. When restoring that table to Inc3, a log warning was outputted mentioning there was no need for a restore. This message in fact means there is no need for the incremental restore portion of the restore process. --- .../apache/hadoop/hbase/backup/impl/RestoreTablesClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java index 05685c8e091e..273ca55798e3 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java @@ -173,7 +173,7 @@ private void restoreImages(BackupImage[] images, TableName sTable, TableName tTa } if (dirList.isEmpty()) { - LOG.warn("Nothing has changed, so there is no need to restore '" + sTable + "'"); + LOG.info("No incremental changes since full backup for '" + sTable + "', skipping incremental restore step."); return; } From ade8c9f98e34506b7775fe2476cdeff296c307e7 Mon Sep 17 00:00:00 2001 From: Dieter De Paepe Date: Thu, 29 Feb 2024 13:21:24 +0100 Subject: [PATCH 2/2] Fix spotless failure. --- .../apache/hadoop/hbase/backup/impl/RestoreTablesClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java index 273ca55798e3..654fe343e27d 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.java @@ -173,7 +173,8 @@ private void restoreImages(BackupImage[] images, TableName sTable, TableName tTa } if (dirList.isEmpty()) { - LOG.info("No incremental changes since full backup for '" + sTable + "', skipping incremental restore step."); + LOG.info("No incremental changes since full backup for '" + sTable + + "', skipping incremental restore step."); return; }