This is an automated email from the ASF dual-hosted git repository. rmattingly pushed a commit to branch 28917-branch-2.6 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit fc48956d3b9ec278d524c6d7395d6f5c75ddf3cb Author: Hernan Romer <[email protected]> AuthorDate: Mon Oct 28 19:00:25 2024 -0400 HBASE-28917 ColumnFamilyMismatchException mixes IA public and private (#6369) Co-authored-by: Hernan Gelaf-Romer <[email protected]> Signed-off-by: Ray Mattingly <[email protected]> --- .../hadoop/hbase/backup/impl/ColumnFamilyMismatchException.java | 3 ++- .../hadoop/hbase/backup/impl/IncrementalTableBackupClient.java | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/ColumnFamilyMismatchException.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/ColumnFamilyMismatchException.java index 87cc896e182..3c1ecde5709 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/ColumnFamilyMismatchException.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/ColumnFamilyMismatchException.java @@ -20,12 +20,13 @@ package org.apache.hadoop.hbase.backup.impl; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor; import org.apache.yetus.audience.InterfaceAudience; @InterfaceAudience.Public -public final class ColumnFamilyMismatchException extends BackupException { +public final class ColumnFamilyMismatchException extends HBaseIOException { private final List<TableName> mismatchedTables; private ColumnFamilyMismatchException(String msg, List<TableName> mismatchedTables) { diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java index 8855bf9186f..6ad487337c2 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java @@ -268,6 +268,12 @@ public class IncrementalTableBackupClient extends TableBackupClient { LOG.debug(newlyArchived.size() + " files have been archived."); } + /** + * @throws IOException If the execution of the backup fails + * @throws ColumnFamilyMismatchException If the column families of the current table do not match + * the column families for the last full backup. In which + * case, a full backup should be taken + */ @Override public void execute() throws IOException, ColumnFamilyMismatchException { try { @@ -491,7 +497,7 @@ public class IncrementalTableBackupClient extends TableBackupClient { try { fs = FileSystem.get(new URI(fullBackupInfo.getBackupRootDir()), conf); } catch (URISyntaxException e) { - throw new IOException("Unable to get fs", e); + throw new IOException("Unable to get fs for backup " + fullBackupInfo.getBackupId(), e); } SnapshotProtos.SnapshotDescription snapshotDescription =
