(hbase) branch branch-2.6 updated: HBASE-28917 ColumnFamilyMismatchException mixes IA public and private (#6369) (#6412)

[rmattingly]

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

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


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new bb483705d52 HBASE-28917 ColumnFamilyMismatchException mixes IA public 
and private (#6369) (#6412)
bb483705d52 is described below

commit bb483705d5266595bce9a33c05a21072604af1e4
Author: Ray Mattingly <rmattin...@apache.org>
AuthorDate: Wed Oct 30 10:58:13 2024 -0400

    HBASE-28917 ColumnFamilyMismatchException mixes IA public and private 
(#6369) (#6412)
    
    Signed-off-by: Ray Mattingly <rmattin...@apache.org>
    Co-authored-by: Hernan Romer <nanu...@gmail.com>
    Co-authored-by: Hernan Gelaf-Romer <hgelafro...@hubspot.com>
---
 .../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 =